Libinfo-392.tar.gz

[apple/libinfo.git] / rpc.subproj / clnt_perror.c

diff --git a/rpc.subproj/clnt_perror.c b/rpc.subproj/clnt_perror.c
index 7ad8e75a7bedc038a777b279e9a4ef62458307a0..a48c79a73a6d8a7ca6f16c600707d4d7edf0d3b9 100644 (file)
--- a/rpc.subproj/clnt_perror.c
+++ b/rpc.subproj/clnt_perror.c
@@ -53,7 +53,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)clnt_perror.c       2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: clnt_perror.c,v 1.2 1999/10/14 21:56:53 wsanchez Exp $";
+static char *rcsid = "$Id: clnt_perror.c,v 1.4 2003/06/23 17:24:59 majka Exp $";
 #endif
 
 /*
@@ -63,6 +63,7 @@ static char *rcsid = "$Id: clnt_perror.c,v 1.2 1999/10/14 21:56:53 wsanchez Exp
  *
  */
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <rpc/rpc.h>
 #include <rpc/types.h>
@@ -130,9 +131,11 @@ clnt_sperror(rpch, s)
                break;
 
        case RPC_VERSMISMATCH:
-               (void) sprintf(str,
-                       "; low version = %lu, high version = %lu", 
-                       e.re_vers.low, e.re_vers.high);
+#ifdef __LP64__
+               (void) sprintf(str, "; low version = %u, high version = %u", e.re_vers.low, e.re_vers.high);
+#else
+               (void) sprintf(str, "; low version = %lu, high version = %lu", e.re_vers.low, e.re_vers.high);
+#endif
                str += strlen(str);
                break;
 
@@ -151,16 +154,20 @@ clnt_sperror(rpch, s)
                break;
 
        case RPC_PROGVERSMISMATCH:
-               (void) sprintf(str, 
-                       "; low version = %lu, high version = %lu", 
-                       e.re_vers.low, e.re_vers.high);
+#ifdef __LP64__
+               (void) sprintf(str, "; low version = %u, high version = %u",  e.re_vers.low, e.re_vers.high);
+#else
+               (void) sprintf(str, "; low version = %lu, high version = %lu",  e.re_vers.low, e.re_vers.high);
+#endif
                str += strlen(str);
                break;
 
        default:        /* unknown */
-               (void) sprintf(str, 
-                       "; s1 = %lu, s2 = %lu", 
-                       e.re_lb.s1, e.re_lb.s2);
+#ifdef __LP64__
+               (void) sprintf(str, "; s1 = %u, s2 = %u", e.re_lb.s1, e.re_lb.s2);
+#else
+               (void) sprintf(str, "; s1 = %lu, s2 = %lu", e.re_lb.s1, e.re_lb.s2);
+#endif
                str += strlen(str);
                break;
        }
@@ -251,7 +258,6 @@ char *
 clnt_spcreateerror(s)
        char *s;
 {
-       extern int sys_nerr;
        char *str = _buf();
 
        if (str == 0)
@@ -275,6 +281,7 @@ clnt_spcreateerror(s)
                        (void) sprintf(&str[strlen(str)], "Error %d",
                            rpc_createerr.cf_error.re_errno);
                break;
+    default: break;
        }
        (void) strcat(str, "\n");
        return (str);