X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Finit.c;h=45aa78da9f295acb92c5da2d333a53744801b170;hb=6a14f02fb2e18e66bbfd48ff3c5a7a5b677b51ed;hp=d9f788f99edca3819688d6c9d9582c8ab6b2fe4a;hpb=2606f9bb3d46fa8e4534e2afa8b29f1630c5f530;p=deb_libnfs.git
diff --git a/lib/init.c b/lib/init.c
index d9f788f..45aa78d 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -12,14 +12,13 @@
along with this program; if not, see .
*/
-#define _GNU_SOURCE
-
-#if defined(WIN32)
-#include
+#ifdef WIN32
+#include "win32_compat.h"
#else
#include
#include
-#endif
+#endif/*WIN32*/
+#define _GNU_SOURCE
#include
#include
@@ -40,7 +39,7 @@ struct rpc_context *rpc_init_context(void)
if (rpc == NULL) {
return NULL;
}
- bzero(rpc, sizeof(struct rpc_context));
+ memset(rpc, 0, sizeof(struct rpc_context));
rpc->encodebuflen = 65536;
rpc->encodebuf = malloc(rpc->encodebuflen);
@@ -83,26 +82,20 @@ void rpc_set_auth(struct rpc_context *rpc, struct AUTH *auth)
if (rpc->auth != NULL) {
auth_destroy(rpc->auth);
}
- rpc->auth = auth;
+ rpc->auth = (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);
}