svn commit: r1302457 - in /qpid/proton/proton-c/src: driver.c proton.c

[rh...@apache.org]

Author: rhs
Date: Mon Mar 19 14:01:45 2012
New Revision: 1302457

URL: http://svn.apache.org/viewvc?rev=1302457&view=rev
Log:
fixed error messages

Modified:
    qpid/proton/proton-c/src/driver.c
    qpid/proton/proton-c/src/proton.c

Modified: qpid/proton/proton-c/src/driver.c
URL: http://svn.apache.org/viewvc/qpid/proton/proton-c/src/driver.c?rev=1302457&r1=1302456&r2=1302457&view=diff
==============================================================================
--- qpid/proton/proton-c/src/driver.c (original)
+++ qpid/proton/proton-c/src/driver.c Mon Mar 19 14:01:45 2012
@@ -438,7 +438,7 @@ pn_selectable_t *pn_connector(pn_driver_
   struct addrinfo *addr;
   int code = getaddrinfo(host, port, NULL, &addr);
   if (code) {
-    fprintf(stderr, "%s", gai_strerror(code));
+    fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(code));
     return NULL;
   }
 
@@ -472,7 +472,7 @@ static void do_accept(pn_selectable_t *s
     char host[1024], serv[64];
     int code;
     if ((code = getnameinfo((struct sockaddr *) &addr, addrlen, host, 1024, serv, 64, 0))) {
-      printf("getnameinfo: %s\n", gai_strerror(code));
+      fprintf(stderr, "getnameinfo: %s\n", gai_strerror(code));
       if (close(sock) == -1)
         perror("close");
     } else {
@@ -491,7 +491,7 @@ pn_selectable_t *pn_acceptor(pn_driver_t
   struct addrinfo *addr;
   int code = getaddrinfo(host, port, NULL, &addr);
   if (code) {
-    fprintf(stderr, "%s", gai_strerror(code));
+    fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(code));
     return NULL;
   }
 

Modified: qpid/proton/proton-c/src/proton.c
URL: http://svn.apache.org/viewvc/qpid/proton/proton-c/src/proton.c?rev=1302457&r1=1302456&r2=1302457&view=diff
==============================================================================
--- qpid/proton/proton-c/src/proton.c (original)
+++ qpid/proton/proton-c/src/proton.c Mon Mar 19 14:01:45 2012
@@ -404,10 +404,10 @@ int main(int argc, char **argv)
     ctx.password = pass;
     mbstowcs(ctx.hostname, host, 1024);
     mbstowcs(ctx.address, address, 1024);
-    if (!pn_connector(drv, host, port, client_callback, &ctx)) perror("proton");
+    if (!pn_connector(drv, host, port, client_callback, &ctx)) pn_fatal("connector failed\n");
   } else {
     struct server_context ctx = {0};
-    if (!pn_acceptor(drv, host, port, server_callback, &ctx)) perror("proton");
+    if (!pn_acceptor(drv, host, port, server_callback, &ctx)) pn_fatal("acceptor failed\n");
   }
 
   pn_driver_run(drv);



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org