From: miker Date: Thu, 5 Jul 2007 18:55:00 +0000 (+0000) Subject: signedness fixes for libxml2 calls X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=17d8955ffd480224b140f4dc20a10f717ac81a21;p=Evergreen.git signedness fixes for libxml2 calls git-svn-id: svn://svn.open-ils.org/ILS/trunk@7522 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/src/c-apps/oils_event.c b/Open-ILS/src/c-apps/oils_event.c index 3b086cead2..f0585cee87 100644 --- a/Open-ILS/src/c-apps/oils_event.c +++ b/Open-ILS/src/c-apps/oils_event.c @@ -122,7 +122,7 @@ void _oilsEventParseEvents() { xmlChar* code = xmlGetProp( child, BAD_CAST "code"); xmlChar* textcode = xmlGetProp( child, BAD_CAST "textcode"); if( code && textcode ) { - osrfHashSet( __oilsEventEvents, code, textcode ); + osrfHashSet( __oilsEventEvents, code, (char*) textcode ); success = 1; } @@ -136,15 +136,15 @@ void _oilsEventParseEvents() { if(lang) { osrfLogDebug(OSRF_LOG_MARK, "Loaded event lang: %s", (char*) lang); osrfHash* langHash = osrfHashGet( - __oilsEventDescriptions, lang); + __oilsEventDescriptions, (char*) lang); if(!langHash) { langHash = osrfNewHash(); - osrfHashSet(__oilsEventDescriptions, langHash, lang); + osrfHashSet(__oilsEventDescriptions, langHash, (char*) lang); } char* content; - if( desc->children && (content = desc->children->content) ) { - osrfLogDebug(OSRF_LOG_MARK, "Loaded event desc: %s", (char*) content); - osrfHashSet( langHash, content, code ); + if( desc->children && (content = (char*) desc->children->content) ) { + osrfLogDebug(OSRF_LOG_MARK, "Loaded event desc: %s", content); + osrfHashSet( langHash, content, (char*) code ); } } } diff --git a/Open-ILS/src/c-apps/oils_idl-core.c b/Open-ILS/src/c-apps/oils_idl-core.c index 0ed848e0a9..19562b5ed1 100644 --- a/Open-ILS/src/c-apps/oils_idl-core.c +++ b/Open-ILS/src/c-apps/oils_idl-core.c @@ -44,13 +44,13 @@ osrfHash* oilsIDLInit( char* idl_filename ) { if (!strcmp( (char*)kid->name, "class" )) { usrData = osrfNewHash(); - osrfHashSet( usrData, xmlGetProp(kid, "id"), "classname"); - osrfHashSet( usrData, xmlGetNsProp(kid, "fieldmapper", OBJECT_NS), "fieldmapper"); + osrfHashSet( usrData, xmlGetProp(kid, BAD_CAST "id"), "classname"); + osrfHashSet( usrData, xmlGetNsProp(kid, BAD_CAST "fieldmapper", BAD_CAST OBJECT_NS), "fieldmapper"); osrfHashSet( idlHash, usrData, (char*)osrfHashGet(usrData, "classname") ); string_tmp = NULL; - if ((string_tmp = (char*)xmlGetNsProp(kid, "tablename", PERSIST_NS))) { + if ((string_tmp = (char*)xmlGetNsProp(kid, BAD_CAST "tablename", BAD_CAST PERSIST_NS))) { osrfHashSet( usrData, strdup( string_tmp ), @@ -59,7 +59,7 @@ osrfHash* oilsIDLInit( char* idl_filename ) { } string_tmp = NULL; - if ((string_tmp = (char*)xmlGetNsProp(kid, "virtual", PERSIST_NS))) { + if ((string_tmp = (char*)xmlGetNsProp(kid, BAD_CAST "virtual", BAD_CAST PERSIST_NS))) { osrfHashSet( usrData, strdup( string_tmp ), @@ -69,7 +69,7 @@ osrfHash* oilsIDLInit( char* idl_filename ) { osrfStringArray* controller = osrfNewStringArray(0); string_tmp = NULL; - if( (string_tmp = (char*)xmlGetProp(kid, "controller") )) { + if( (string_tmp = (char*)xmlGetProp(kid, BAD_CAST "controller") )) { char* controller_list = strdup( string_tmp ); osrfLogInfo(OSRF_LOG_MARK, "Controller list is %s", string_tmp ); @@ -100,7 +100,7 @@ osrfHash* oilsIDLInit( char* idl_filename ) { if (!strcmp( (char*)_cur->name, "fields" )) { string_tmp = NULL; - if( (string_tmp = (char*)xmlGetNsProp(_cur, "primary", PERSIST_NS)) ) { + if( (string_tmp = (char*)xmlGetNsProp(_cur, BAD_CAST "primary", BAD_CAST PERSIST_NS)) ) { osrfHashSet( usrData, strdup( string_tmp ), @@ -109,7 +109,7 @@ osrfHash* oilsIDLInit( char* idl_filename ) { } string_tmp = NULL; - if( (string_tmp = (char*)xmlGetNsProp(_cur, "sequence", PERSIST_NS)) ) { + if( (string_tmp = (char*)xmlGetNsProp(_cur, BAD_CAST "sequence", BAD_CAST PERSIST_NS)) ) { osrfHashSet( usrData, strdup( string_tmp ), @@ -128,7 +128,7 @@ osrfHash* oilsIDLInit( char* idl_filename ) { _tmp = osrfNewHash(); string_tmp = NULL; - if( (string_tmp = (char*)xmlGetNsProp(_f, "array_position", OBJECT_NS)) ) { + if( (string_tmp = (char*)xmlGetNsProp(_f, BAD_CAST "array_position", BAD_CAST OBJECT_NS)) ) { osrfHashSet( _tmp, strdup( string_tmp ), @@ -137,7 +137,7 @@ osrfHash* oilsIDLInit( char* idl_filename ) { } string_tmp = NULL; - if( (string_tmp = (char*)xmlGetNsProp(_f, "virtual", PERSIST_NS)) ) { + if( (string_tmp = (char*)xmlGetNsProp(_f, BAD_CAST "virtual", BAD_CAST PERSIST_NS)) ) { osrfHashSet( _tmp, strdup( string_tmp ), @@ -146,7 +146,7 @@ osrfHash* oilsIDLInit( char* idl_filename ) { } string_tmp = NULL; - if( (string_tmp = (char*)xmlGetNsProp(_f, "primitive", PERSIST_NS)) ) { + if( (string_tmp = (char*)xmlGetNsProp(_f, BAD_CAST "primitive", BAD_CAST PERSIST_NS)) ) { osrfHashSet( _tmp, strdup( string_tmp ), @@ -155,7 +155,7 @@ osrfHash* oilsIDLInit( char* idl_filename ) { } string_tmp = NULL; - if( (string_tmp = (char*)xmlGetProp(_f, "name")) ) { + if( (string_tmp = (char*)xmlGetProp(_f, BAD_CAST "name")) ) { osrfHashSet( _tmp, strdup( string_tmp ), @@ -186,7 +186,7 @@ osrfHash* oilsIDLInit( char* idl_filename ) { _tmp = osrfNewHash(); string_tmp = NULL; - if( (string_tmp = (char*)xmlGetProp(_l, "reltype")) ) { + if( (string_tmp = (char*)xmlGetProp(_l, BAD_CAST "reltype")) ) { osrfHashSet( _tmp, strdup( string_tmp ), @@ -196,7 +196,7 @@ osrfHash* oilsIDLInit( char* idl_filename ) { osrfLogInfo(OSRF_LOG_MARK, "Adding link with reltype %s", string_tmp ); string_tmp = NULL; - if( (string_tmp = (char*)xmlGetProp(_l, "key")) ) { + if( (string_tmp = (char*)xmlGetProp(_l, BAD_CAST "key")) ) { osrfHashSet( _tmp, strdup( string_tmp ), @@ -206,7 +206,7 @@ osrfHash* oilsIDLInit( char* idl_filename ) { osrfLogInfo(OSRF_LOG_MARK, "Link fkey is %s", string_tmp ); string_tmp = NULL; - if( (string_tmp = (char*)xmlGetProp(_l, "class")) ) { + if( (string_tmp = (char*)xmlGetProp(_l, BAD_CAST "class")) ) { osrfHashSet( _tmp, strdup( string_tmp ), @@ -218,7 +218,7 @@ osrfHash* oilsIDLInit( char* idl_filename ) { osrfStringArray* map = osrfNewStringArray(0); string_tmp = NULL; - if( (string_tmp = (char*)xmlGetProp(_l, "map") )) { + if( (string_tmp = (char*)xmlGetProp(_l, BAD_CAST "map") )) { char* map_list = strdup( string_tmp ); osrfLogInfo(OSRF_LOG_MARK, "Link mapping list is %s", string_tmp ); @@ -235,7 +235,7 @@ osrfHash* oilsIDLInit( char* idl_filename ) { osrfHashSet( _tmp, map, "map"); string_tmp = NULL; - if( (string_tmp = (char*)xmlGetProp(_l, "field")) ) { + if( (string_tmp = (char*)xmlGetProp(_l, BAD_CAST "field")) ) { osrfHashSet( _tmp, strdup( string_tmp ),