From bb2c5f336c0c66191ec658999a952649adbe36a7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Voc=C5=AF?= Date: Thu, 10 Feb 2005 15:50:27 +0000 Subject: [PATCH] * --- org.glite.lb.common/src/il_msg.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/org.glite.lb.common/src/il_msg.c b/org.glite.lb.common/src/il_msg.c index a93121a..731837f 100644 --- a/org.glite.lb.common/src/il_msg.c +++ b/org.glite.lb.common/src/il_msg.c @@ -5,7 +5,7 @@ #include #include #include - +#include int encode_il_msg(char **buffer, const char *event) @@ -15,7 +15,7 @@ encode_il_msg(char **buffer, const char *event) /* allocate enough room to hold the message */ - len = 17 + len_string(event); + len = 17 + len_string((char*)event); if((*buffer = malloc(len)) == NULL) { return(-1); } @@ -27,7 +27,7 @@ encode_il_msg(char **buffer, const char *event) p += 17; /* write rest of the message */ - p = put_string(p, event); + p = put_string(p, (char*)event); return(p - *buffer); } @@ -38,7 +38,10 @@ encode_il_reply(char **buffer, int err_code, int err_code_min, const char *err_msg) { - len = 17 + len_int(err_code) + len_int(err_code_min) + len_string(err_msg); + int len; + char *p; + + len = 17 + len_int(err_code) + len_int(err_code_min) + len_string((char*)err_msg); if((*buffer = malloc(len)) == NULL) { return(-1); } @@ -47,7 +50,7 @@ encode_il_reply(char **buffer, p = *buffer + 17; p = put_int(p, err_code); p = put_int(p, err_code_min); - p = put_string(p, err_msg); + p = put_string(p, (char*)err_msg); return(p - *buffer); } @@ -57,7 +60,7 @@ decode_il_msg(char **event, const char *buf) { char *p; - p = get_string(buf, event); + p = get_string((char*)buf, event); if(p == NULL) { if(*event) { free(*event); *event = NULL; }; return(EINVAL); @@ -88,15 +91,15 @@ int read_il_data(char **buffer, int (*reader)(char *, const int)) { - char buffer[17]; + char buf[17]; int ret, len; /* read 17 byte header */ - len = (*reader)(buffer, 17); + len = (*reader)(buf, 17); if(len < 0) { goto err; } - if((len=atoi(buffer)) <= 0) { + if((len=atoi(buf)) <= 0) { len = EINVAL; goto err; } -- 1.8.2.3