Fix compiler warnings.

SVN revision: 31719
This commit is contained in:
Sebastian Dransfeld 2007-09-14 23:38:17 +00:00
parent fdd316902d
commit bc1add673e
2 changed files with 12 additions and 12 deletions

View File

@ -15,6 +15,7 @@
#if HAVE_ALLOCA_H #if HAVE_ALLOCA_H
#include <alloca.h> #include <alloca.h>
#endif #endif
#include <ctype.h>
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H
#include <netinet/in.h> #include <netinet/in.h>

View File

@ -1131,7 +1131,7 @@ _eet_data_string_escape(const char *str)
else sz += 1; else sz += 1;
} }
s = malloc(sz + 1); s = malloc(sz + 1);
if (!s) return; if (!s) return NULL;
for (strp = str, sp = s; *strp; strp++, sp++) for (strp = str, sp = s; *strp; strp++, sp++)
{ {
if (*strp == '\"') if (*strp == '\"')
@ -1151,7 +1151,7 @@ _eet_data_string_escape(const char *str)
} }
static void static void
_eet_data_dump_string_escape(void *dumpdata, void *dumpfunc(void *data, const char *str), const char *str) _eet_data_dump_string_escape(void *dumpdata, void dumpfunc(void *data, const char *str), const char *str)
{ {
char *s; char *s;
@ -1164,9 +1164,10 @@ _eet_data_dump_string_escape(void *dumpdata, void *dumpfunc(void *data, const ch
} }
static char * static char *
_eet_data_dump_token_get(char *src, int *len) _eet_data_dump_token_get(const char *src, int *len)
{ {
char *p, *tok = NULL; const char *p;
char *tok = NULL;
int in_token = 0; int in_token = 0;
int in_quote = 0; int in_quote = 0;
int tlen = 0, tsize = 0; int tlen = 0, tsize = 0;
@ -1310,7 +1311,6 @@ _eet_data_dump_encode(Node *node,
{ {
Eet_Data_Chunk *chnk = NULL, *echnk = NULL; Eet_Data_Chunk *chnk = NULL, *echnk = NULL;
Eet_Data_Stream *ds; Eet_Data_Stream *ds;
int i;
void *cdata, *data; void *cdata, *data;
int csize, size; int csize, size;
Node *n; Node *n;
@ -1515,15 +1515,14 @@ _eet_data_dump_encode(Node *node,
static void * static void *
_eet_data_dump_parse(int *size_ret, _eet_data_dump_parse(int *size_ret,
char *src, const char *src,
int size) int size)
{ {
void *cdata = NULL; void *cdata = NULL;
char *p; const char *p;
#define M_NONE 0 #define M_NONE 0
#define M_STRUCT 1 #define M_STRUCT 1
#define M_ 2 #define M_ 2
int mode = M_NONE;
int left, jump; int left, jump;
Node *node_base = NULL; Node *node_base = NULL;
Node *node = NULL; Node *node = NULL;
@ -1745,8 +1744,8 @@ _eet_data_descriptor_decode(Eet_Data_Descriptor *edd,
void *dumpdata) void *dumpdata)
{ {
void *data = NULL; void *data = NULL;
char *p, *buf, tbuf[256], *ts; char *p, *buf, tbuf[256];
int size, i, dump, bsize; int size, i, dump;
Eet_Data_Chunk chnk; Eet_Data_Chunk chnk;
if (words_bigendian == -1) if (words_bigendian == -1)
@ -2153,7 +2152,7 @@ _eet_data_descriptor_decode(Eet_Data_Descriptor *edd,
if ((type >= EET_T_CHAR) && if ((type >= EET_T_CHAR) &&
(type <= EET_T_STRING)) (type <= EET_T_STRING))
{ {
data_ret = 1; data_ret = (void *)1;
ret = eet_data_get_type(type, ret = eet_data_get_type(type,
echnk.data, echnk.data,
((char *)echnk.data) + echnk.size, ((char *)echnk.data) + echnk.size,
@ -2196,7 +2195,7 @@ _eet_data_descriptor_decode(Eet_Data_Descriptor *edd,
if ((type >= EET_T_CHAR) && if ((type >= EET_T_CHAR) &&
(type <= EET_T_STRING)) (type <= EET_T_STRING))
{ {
data_ret = 1; data_ret = (void *)1;
ret = eet_data_get_type(type, ret = eet_data_get_type(type,
echnk.data, echnk.data,
((char *)echnk.data) + echnk.size, ((char *)echnk.data) + echnk.size,