diff options
| -rw-r--r-- | source/iniparser/src/dictionary.c | 14 | ||||
| -rw-r--r-- | source/iniparser/src/iniparser.c | 10 | ||||
| -rw-r--r-- | source/iniparser/src/iniparser.h | 10 | ||||
| -rw-r--r-- | source/iniparser/src/strlib.c | 2 | ||||
| -rw-r--r-- | source/iniparser/src/strlib.h | 2 |
5 files changed, 19 insertions, 19 deletions
diff --git a/source/iniparser/src/dictionary.c b/source/iniparser/src/dictionary.c index 4381b9cb780..1f55cb4c244 100644 --- a/source/iniparser/src/dictionary.c +++ b/source/iniparser/src/dictionary.c @@ -114,11 +114,11 @@ dictionary * dictionary_new(int size) /* If no size was specified, allocate space for DICTMINSZ */ if (size<DICTMINSZ) size=DICTMINSZ ; - d = calloc(1, sizeof(dictionary)); + d = (dictionary *)calloc(1, sizeof(dictionary)); d->size = size ; - d->val = calloc(size, sizeof(char*)); - d->key = calloc(size, sizeof(char*)); - d->hash = calloc(size, sizeof(unsigned)); + d->val = (char **)calloc(size, sizeof(char*)); + d->key = (char **)calloc(size, sizeof(char*)); + d->hash = (unsigned int *)calloc(size, sizeof(unsigned)); return d ; } @@ -316,9 +316,9 @@ void dictionary_set(dictionary * d, char * key, char * val) if (d->n==d->size) { /* Reached maximum size: reallocate blackboard */ - d->val = mem_double(d->val, d->size * sizeof(char*)) ; - d->key = mem_double(d->key, d->size * sizeof(char*)) ; - d->hash = mem_double(d->hash, d->size * sizeof(unsigned)) ; + d->val = (char **)mem_double(d->val, d->size * sizeof(char*)) ; + d->key = (char **)mem_double(d->key, d->size * sizeof(char*)) ; + d->hash = (unsigned int *)mem_double(d->hash, d->size * sizeof(unsigned)) ; /* Double size */ d->size *= 2 ; diff --git a/source/iniparser/src/iniparser.c b/source/iniparser/src/iniparser.c index 0c06ab364b1..67f42a347d3 100644 --- a/source/iniparser/src/iniparser.c +++ b/source/iniparser/src/iniparser.c @@ -230,7 +230,7 @@ void iniparser_dump_ini(dictionary * d, FILE * f) iniparser_getstring() instead. */ /*--------------------------------------------------------------------------*/ -char * iniparser_getstr(dictionary * d, char * key) +char * iniparser_getstr(dictionary * d, const char * key) { return iniparser_getstring(d, key, NULL); } @@ -251,7 +251,7 @@ char * iniparser_getstr(dictionary * d, char * key) the dictionary, do not free or modify it. */ /*--------------------------------------------------------------------------*/ -char * iniparser_getstring(dictionary * d, char * key, char * def) +char * iniparser_getstring(dictionary * d, const char * key, char * def) { char * lc_key ; char * sval ; @@ -280,7 +280,7 @@ char * iniparser_getstring(dictionary * d, char * key, char * def) the notfound value is returned. */ /*--------------------------------------------------------------------------*/ -int iniparser_getint(dictionary * d, char * key, int notfound) +int iniparser_getint(dictionary * d, const char * key, int notfound) { char * str ; @@ -346,7 +346,7 @@ double iniparser_getdouble(dictionary * d, char * key, double notfound) necessarily have to be 0 or 1. */ /*--------------------------------------------------------------------------*/ -int iniparser_getboolean(dictionary * d, char * key, int notfound) +int iniparser_getboolean(dictionary * d, const char * key, int notfound) { char * c ; int ret ; @@ -442,7 +442,7 @@ void iniparser_unset(dictionary * ini, char * entry) */ /*--------------------------------------------------------------------------*/ -dictionary * iniparser_load(char * ininame) +dictionary * iniparser_load(const char * ininame) { dictionary * d ; char lin[ASCIILINESZ+1]; diff --git a/source/iniparser/src/iniparser.h b/source/iniparser/src/iniparser.h index 98e8b33b781..2df8ffe8374 100644 --- a/source/iniparser/src/iniparser.h +++ b/source/iniparser/src/iniparser.h @@ -123,7 +123,7 @@ void iniparser_dump(dictionary * d, FILE * f); iniparser_getstring() instead. */ /*--------------------------------------------------------------------------*/ -char * iniparser_getstr(dictionary * d, char * key); +char * iniparser_getstr(dictionary * d, const char * key); /*-------------------------------------------------------------------------*/ @@ -141,7 +141,7 @@ char * iniparser_getstr(dictionary * d, char * key); the dictionary, do not free or modify it. */ /*--------------------------------------------------------------------------*/ -char * iniparser_getstring(dictionary * d, char * key, char * def); +char * iniparser_getstring(dictionary * d, const char * key, char * def); /*-------------------------------------------------------------------------*/ /** @@ -156,7 +156,7 @@ char * iniparser_getstring(dictionary * d, char * key, char * def); the notfound value is returned. */ /*--------------------------------------------------------------------------*/ -int iniparser_getint(dictionary * d, char * key, int notfound); +int iniparser_getint(dictionary * d, const char * key, int notfound); /*-------------------------------------------------------------------------*/ /** @@ -205,7 +205,7 @@ double iniparser_getdouble(dictionary * d, char * key, double notfound); necessarily have to be 0 or 1. */ /*--------------------------------------------------------------------------*/ -int iniparser_getboolean(dictionary * d, char * key, int notfound); +int iniparser_getboolean(dictionary * d, const char * key, int notfound); /*-------------------------------------------------------------------------*/ @@ -264,7 +264,7 @@ int iniparser_find_entry(dictionary * ini, char * entry) ; The returned dictionary must be freed using iniparser_freedict(). */ /*--------------------------------------------------------------------------*/ -dictionary * iniparser_load(char * ininame); +dictionary * iniparser_load(const char * ininame); /*-------------------------------------------------------------------------*/ /** diff --git a/source/iniparser/src/strlib.c b/source/iniparser/src/strlib.c index 3bfddaaebe2..b954a36cf79 100644 --- a/source/iniparser/src/strlib.c +++ b/source/iniparser/src/strlib.c @@ -51,7 +51,7 @@ */ /*--------------------------------------------------------------------------*/ -char * strlwc(char * s) +char * strlwc(const char * s) { static char l[ASCIILINESZ+1]; int i ; diff --git a/source/iniparser/src/strlib.h b/source/iniparser/src/strlib.h index 8d8f15fcf0a..39ca26f1df0 100644 --- a/source/iniparser/src/strlib.h +++ b/source/iniparser/src/strlib.h @@ -45,7 +45,7 @@ allocated, it will be modified at each function call (not re-entrant). */ /*--------------------------------------------------------------------------*/ -char * strlwc(char * s); +char * strlwc(const char * s); /*-------------------------------------------------------------------------*/ /** |