Merge branch 'master' into win32-3

[deb_libnfs.git] / lib / init.c

diff --git a/lib/init.c b/lib/init.c
index d9f788f99edca3819688d6c9d9582c8ab6b2fe4a..a247787d4dfa364b17b80bbae9a6f1d8ce3177dd 100644 (file)
--- a/lib/init.c
+++ b/lib/init.c
@@ -40,7 +40,7 @@ struct rpc_context *rpc_init_context(void)
        if (rpc == NULL) {
                return NULL;
        }
-       bzero(rpc, sizeof(struct rpc_context));
+       bzero((char *)rpc, sizeof(struct rpc_context));
 
        rpc->encodebuflen = 65536;
        rpc->encodebuf = malloc(rpc->encodebuflen);
@@ -90,19 +90,13 @@ void rpc_set_auth(struct rpc_context *rpc, struct AUTH *auth)
 void rpc_set_error(struct rpc_context *rpc, char *error_string, ...)
 {
         va_list ap;
-       char *str;
 
        if (rpc->error_string != NULL) {
                free(rpc->error_string);
        }
         va_start(ap, error_string);
-#if defined (WIN32)
-       str = malloc(1024);
-       vsnprintf(str, 1024, error_string, ap);
-#else
-       vasprintf(&str, error_string, ap);
-#endif
-       rpc->error_string = str;
+       rpc->error_string = malloc(1024);
+       vsnprintf(rpc->error_string, 1024, error_string, ap);
         va_end(ap);
 }