Changeset 907

Timestamp:

Jan 26, 2007 5:09:14 PM (17 years ago)

Author:

bennylp

Message:

Ticket #80: pj_gethostbyname() should return the appropriate native error code when it fails

Location:

pjproject/trunk/pjlib/src/pj

Files:

• addr_resolv_sock.c (modified) (1 diff)
• os_error_win32.c (modified) (3 diffs)

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

@@ -38 +38 @@
 
     he = gethostbyname(copy);
-    if (!he)
-        return PJ_ERESOLVE;
+    if (!he) {
+        return pj_get_netos_error();
+    }
 
     phe->h_name = he->h_name;

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

@@ -142 +142 @@
                        char *buf, pj_size_t bufsize)
 {
-    int len;
+    int len = 0;
     PJ_DECL_UNICODE_TEMP_BUF(wbuf,128);
 
@@ -154 +154 @@
      */
 
-#if PJ_NATIVE_STRING_IS_UNICODE
-    len = FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM 
-                         | FORMAT_MESSAGE_IGNORE_INSERTS,
-                         NULL,
-                         os_errcode,
-                         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), 
-                         wbuf,
-                         sizeof(wbuf),
-                         NULL);
-    if (len) {
-        pj_unicode_to_ansi(wbuf, len, buf, bufsize);
-    }
-#else
-    len = FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM 
-                         | FORMAT_MESSAGE_IGNORE_INSERTS,
-                         NULL,
-                         os_errcode,
-                         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), 
-                         buf,
-                         bufsize,
-                         NULL);
-#endif
-
     if (!len) {
-
 #if defined(PJ_HAS_ERROR_STRING) && (PJ_HAS_ERROR_STRING!=0)
         int i;
@@ -194 +170 @@
 #endif  /* PJ_HAS_ERROR_STRING */
 
-    } else {
-        /* Remove trailing newlines. */
-        while (len && (buf[len-1] == '\n' || buf[len-1] == '\r')) {
-            buf[len-1] = '\0';
-            --len;
+    }
+
+
+    if (!len) {
+#if PJ_NATIVE_STRING_IS_UNICODE
+        len = FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM 
+                             | FORMAT_MESSAGE_IGNORE_INSERTS,
+                             NULL,
+                             os_errcode,
+                             MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), 
+                             wbuf,
+                             sizeof(wbuf),
+                             NULL);
+        if (len) {
+            pj_unicode_to_ansi(wbuf, len, buf, bufsize);
+        }
+#else
+        len = FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM 
+                             | FORMAT_MESSAGE_IGNORE_INSERTS,
+                             NULL,
+                             os_errcode,
+                             MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), 
+                             buf,
+                             bufsize,
+                             NULL);
+#endif
+
+        if (len) {
+            /* Remove trailing newlines. */
+            while (len && (buf[len-1] == '\n' || buf[len-1] == '\r')) {
+                buf[len-1] = '\0';
+                --len;
+            }
         }
     }