[open-ils-commits] r7522 - trunk/Open-ILS/src/c-apps
svn at svn.open-ils.org
svn at svn.open-ils.org
Thu Jul 5 14:58:53 EDT 2007
Author: miker
Date: 2007-07-05 14:55:00 -0400 (Thu, 05 Jul 2007)
New Revision: 7522
Modified:
trunk/Open-ILS/src/c-apps/oils_event.c
trunk/Open-ILS/src/c-apps/oils_idl-core.c
Log:
signedness fixes for libxml2 calls
Modified: trunk/Open-ILS/src/c-apps/oils_event.c
===================================================================
--- trunk/Open-ILS/src/c-apps/oils_event.c 2007-07-05 17:04:14 UTC (rev 7521)
+++ trunk/Open-ILS/src/c-apps/oils_event.c 2007-07-05 18:55:00 UTC (rev 7522)
@@ -122,7 +122,7 @@
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 @@
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 );
}
}
}
Modified: trunk/Open-ILS/src/c-apps/oils_idl-core.c
===================================================================
--- trunk/Open-ILS/src/c-apps/oils_idl-core.c 2007-07-05 17:04:14 UTC (rev 7521)
+++ trunk/Open-ILS/src/c-apps/oils_idl-core.c 2007-07-05 18:55:00 UTC (rev 7522)
@@ -44,13 +44,13 @@
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 @@
}
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 @@
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 @@
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 @@
}
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 @@
_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 @@
}
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 @@
}
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 @@
}
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 @@
_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 @@
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 @@
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 @@
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 @@
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 ),
More information about the open-ils-commits
mailing list