File iniparser-2.15.diff of Package libiniparser

Overview Repositories Revisions Requests Users Attributes Meta

File iniparser-2.15.diff of Package libiniparser (Revision a02c1210ecb6b871bc203c17edf1c9af)

Currently displaying revision a02c1210ecb6b871bc203c17edf1c9af , Show latest

Author: Günther Deschner <gd@suse.de>
Subject: apply some const and fix c++ warnings

--- src/dictionary.c	2002-06-17 11:30:46.000000000 +0200
+++ src/dictionary.c	2006-09-26 23:56:44.000000000 +0200
@@ -114,11 +114,11 @@
 	/* 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 @@
 	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 ;
--- src/iniparser.c	2006-06-27 21:12:29.000000000 +0200
+++ src/iniparser.c	2006-09-26 23:56:44.000000000 +0200
@@ -230,7 +230,7 @@
   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 @@
   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 ;
@@ -294,7 +294,7 @@
   Credits: Thanks to A. Becker for suggesting strtol()
  */
 /*--------------------------------------------------------------------------*/
-int iniparser_getint(dictionary * d, char * key, int notfound)
+int iniparser_getint(dictionary * d, const char * key, int notfound)
 {
     char    *   str ;
 
@@ -360,7 +360,7 @@
   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 ;
@@ -456,7 +456,7 @@
  */
 /*--------------------------------------------------------------------------*/
 
-dictionary * iniparser_load(char * ininame)
+dictionary * iniparser_load(const char * ininame)
 {
     dictionary  *   d ;
     char        lin[ASCIILINESZ+1];
--- src/iniparser.h	2006-06-27 21:18:09.000000000 +0200
+++ src/iniparser.h	2006-09-26 23:56:44.000000000 +0200
@@ -123,7 +123,7 @@
   iniparser_getstring() instead.
  */
 /*--------------------------------------------------------------------------*/
-char * iniparser_getstr(dictionary * d, char * key);
+char * iniparser_getstr(dictionary * d, const char * key);
 
 
 /*-------------------------------------------------------------------------*/
@@ -141,7 +141,7 @@
   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);
 
 /*-------------------------------------------------------------------------*/
 /**
@@ -170,7 +170,7 @@
   Credits: Thanks to A. Becker for suggesting strtol()
  */
 /*--------------------------------------------------------------------------*/
-int iniparser_getint(dictionary * d, char * key, int notfound);
+int iniparser_getint(dictionary * d, const char * key, int notfound);
 
 /*-------------------------------------------------------------------------*/
 /**
@@ -219,7 +219,7 @@
   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);
 
 
 /*-------------------------------------------------------------------------*/
@@ -278,7 +278,7 @@
   The returned dictionary must be freed using iniparser_freedict().
  */
 /*--------------------------------------------------------------------------*/
-dictionary * iniparser_load(char * ininame);
+dictionary * iniparser_load(const char * ininame);
 
 /*-------------------------------------------------------------------------*/
 /**
--- src/strlib.c	2002-12-12 11:29:16.000000000 +0100
+++ src/strlib.c	2006-09-26 23:56:44.000000000 +0200
@@ -51,7 +51,7 @@
  */
 /*--------------------------------------------------------------------------*/
 
-char * strlwc(char * s)
+char * strlwc(const char * s)
 {
     static char l[ASCIILINESZ+1];
     int i ;
--- src/strlib.h	2001-10-19 10:31:41.000000000 +0200
+++ src/strlib.h	2006-09-26 23:56:44.000000000 +0200
@@ -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);
 
 /*-------------------------------------------------------------------------*/
 /**

Places

File iniparser-2.15.diff of Package libiniparser (Revision a02c1210ecb6b871bc203c17edf1c9af)

Places