Merge changes from CUPS 1.5svn-r9717.

[thirdparty/cups.git] / backend / socket.c

diff --git a/backend/socket.c b/backend/socket.c
index 4149559489c3ef45922460ae8fdf40f326ddbdb4..d993dbabc27a1c54b53c8c7380390db0e64f7a0e 100644 (file)
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -352,22 +352,20 @@ main(int  argc,                           /* I - Number of command-line arguments (6 or 7) */
        {
          case EHOSTDOWN :
              _cupsLangPrintFilter(stderr, "WARNING",
-                                  _("Network printer \"%s\" may not exist or "
-                                    "is unavailable at this time."),
-                                  hostname);
+                                  _("The printer may not exist or "
+                                    "is unavailable at this time."));
              break;
 
          case EHOSTUNREACH :
              _cupsLangPrintFilter(stderr, "WARNING",
-                                  _("Network printer \"%s\" is unreachable at "
-                                    "this time."), hostname);
+                                  _("The printer is unreachable at this "
+                                    "time."));
              break;
 
          case ECONNREFUSED :
          default :
              _cupsLangPrintFilter(stderr, "WARNING",
-                                  _("Network printer \"%s\" is busy."),
-                                  hostname);
+                                  _("The printer is busy."));
              break;
         }
 
@@ -379,8 +377,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
       else
       {
        _cupsLangPrintFilter(stderr, "ERROR",
-                            _("Network printer \"%s\" is not responding."),
-                            hostname);
+                            _("The printer is not responding."));
        sleep(30);
       }
     }
@@ -391,17 +388,9 @@ main(int  argc,                            /* I - Number of command-line arguments (6 or 7) */
   fputs("STATE: -connecting-to-device\n", stderr);
   _cupsLangPrintFilter(stderr, "INFO", _("Connected to printer."));
 
-#ifdef AF_INET6
-  if (addr->addr.addr.sa_family == AF_INET6)
-    fprintf(stderr, "DEBUG: Connected to [%s]:%d (IPv6)...\n",
-           httpAddrString(&addr->addr, addrname, sizeof(addrname)),
-           ntohs(addr->addr.ipv6.sin6_port));
-  else
-#endif /* AF_INET6 */
-    if (addr->addr.addr.sa_family == AF_INET)
-      fprintf(stderr, "DEBUG: Connected to %s:%d (IPv4)...\n",
-             httpAddrString(&addr->addr, addrname, sizeof(addrname)),
-             ntohs(addr->addr.ipv4.sin_port));
+  fprintf(stderr, "DEBUG: Connected to %s:%d...\n",
+         httpAddrString(&(addr->addr), addrname, sizeof(addrname)),
+         _httpAddrPort(&(addr->addr)));
 
  /*
   * Print everything...