Changeset 463:5585d37d0979 in verona

Timestamp:

Apr 19, 2012 4:09:37 PM (14 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Message:

avoid usage of phMsgStateInfo2

Location:

phcpp

Files:

• phapipp.cpp (modified) (2 diffs)
• phapipp.h (modified) (1 diff)

phcpp/phapipp.cpp

@@ -481 +481 @@
 void phapi::onConfProgress(int cfid, const phConfStateInfo_t *info)  { }
 void phapi::onRegProgress(int regid, int status)  { }
-void phapi::onMsgProgress(int mid,  const phMsgStateInfo2 *info)
+void phapi::onMsgProgress(int mid,  const phMsgStateInfo *info)
 {
         onMsgProgress2(mid,     (char *)info->rawctt, (char *)info->content);
@@ -531 +531 @@
 {
         if (uniqueobj) {
-                phMsgStateInfo2  mi2;
-
-                mi2.event = info->event;
-                mi2.status = info->status;
-                mi2.from = info->from;
-                mi2.to = info->to;
-                mi2.ctype = info->ctype;
-                mi2.subtype = info->subtype;
-                mi2.content = info->content;
-                mi2.rawctt = info->rawctt;
-                mi2.tid = info->tid;
-                mi2.cid = info->cid;
-
-                typedef std::pair<const char*, const char*>  cstrpair;
-                for( int i = 0; i < info->hlist.count; i++) {
-                        const struct ph_hdr_val* e = info->hlist.elems + i;
-                        mi2.hlist.push_back(cstrpair(e->hdr, e->val));
-                }
-
-                uniqueobj->onMsgProgress(mid, &mi2);
+                uniqueobj->onMsgProgress(mid, info);
         }
 

phcpp/phapipp.h

@@ -211 +211 @@
         virtual void onConfProgress(int cfid, const phConfStateInfo_t *info);
         virtual void onRegProgress(int regid, int status);
-        virtual void onMsgProgress(int mid,  const phMsgStateInfo2 *info);
+        virtual void onMsgProgress(int mid,  const phMsgStateInfo *info);
         virtual void onMsgProgress2(int mid,  char * type, char * content);
         virtual void onConnectionLost(const char* host, int port);