Changeset 5377

Timestamp:

Jul 5, 2016 1:21:31 PM (8 years ago)

Author:

nanang

Message:

Misc (re #1928): Reverted back some dirty changes in r5376 about address info indexing.

File:

• pjproject/trunk/pjlib/src/pj/addr_resolv_sock.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/addr_resolv_sock.c

@@ -187 +187 @@
 
     /* Enumerate each item in the result */
-    rc = 0;
     for (i=0; i<*count && res; res=res->ai_next) {
         /* Ignore unwanted address families */
@@ -195 +194 @@
         /* Store canonical name (possibly truncating the name) */
         if (res->ai_canonname) {
-            pj_ansi_strncpy(ai[rc].ai_canonname, res->ai_canonname,
-                            sizeof(ai[rc].ai_canonname));
-            ai[rc].ai_canonname[sizeof(ai[rc].ai_canonname)-1] = '\0';
+            pj_ansi_strncpy(ai[i].ai_canonname, res->ai_canonname,
+                            sizeof(ai[i].ai_canonname));
+            ai[i].ai_canonname[sizeof(ai[i].ai_canonname)-1] = '\0';
         } else {
-            pj_ansi_strcpy(ai[rc].ai_canonname, nodecopy);
+            pj_ansi_strcpy(ai[i].ai_canonname, nodecopy);
         }
 
         /* Store address */
         PJ_ASSERT_ON_FAIL(res->ai_addrlen <= sizeof(pj_sockaddr), continue);
-        pj_memcpy(&ai[rc].ai_addr, res->ai_addr, res->ai_addrlen);
-        PJ_SOCKADDR_RESET_LEN(&ai[rc].ai_addr);
+        pj_memcpy(&ai[i].ai_addr, res->ai_addr, res->ai_addrlen);
+        PJ_SOCKADDR_RESET_LEN(&ai[i].ai_addr);
 
         /* Next slot */
-        ++rc;
-    }
-
-    *count = rc;
+        ++i;
+    }
+
+    *count = i;
 
     freeaddrinfo(orig_res);