From a7d00b6ebc9dd9772b165eb1a12f7737fb9df691 Mon Sep 17 00:00:00 2001 From: miker Date: Tue, 20 Nov 2007 13:13:20 +0000 Subject: [PATCH] Patch from Scott McKellar to apply some const-correctness to the ILS C code git-svn-id: svn://svn.open-ils.org/ILS/trunk@8095 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/c-apps/oils_idl-core.c | 16 ++++++++-------- Open-ILS/src/c-apps/openils/oils_idl.h | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Open-ILS/src/c-apps/oils_idl-core.c b/Open-ILS/src/c-apps/oils_idl-core.c index 1eea838996..5994e13feb 100644 --- a/Open-ILS/src/c-apps/oils_idl-core.c +++ b/Open-ILS/src/c-apps/oils_idl-core.c @@ -16,13 +16,13 @@ #define OBJECT_NS "http://open-ils.org/spec/opensrf/IDL/objects/v1" #define BASE_NS "http://opensrf.org/spec/IDL/base/v1" -xmlDocPtr idlDoc = NULL; // parse and store the IDL here +static xmlDocPtr idlDoc = NULL; // parse and store the IDL here /* parse and store the IDL here */ -osrfHash* idlHash; +static osrfHash* idlHash; -osrfHash* oilsIDL() { return idlHash; } -osrfHash* oilsIDLInit( char* idl_filename ) { +osrfHash* oilsIDL(void) { return idlHash; } +osrfHash* oilsIDLInit( const char* idl_filename ) { if (idlHash) return idlHash; @@ -294,7 +294,7 @@ osrfHash* oilsIDLInit( char* idl_filename ) { return idlHash; } -osrfHash* oilsIDLFindPath( char* path, ... ) { +osrfHash* oilsIDLFindPath( const char* path, ... ) { if(!path || strlen(path) < 1) return NULL; osrfHash* obj = idlHash; @@ -316,13 +316,13 @@ osrfHash* oilsIDLFindPath( char* path, ... ) { return obj; } -int oilsIDL_classIsFieldmapper ( char* classname ) { +int oilsIDL_classIsFieldmapper ( const char* classname ) { if (!classname) return 0; if(oilsIDLFindPath( "/%s", classname )) return 1; return 0; } -int oilsIDL_ntop (char* classname, char* fieldname) { +int oilsIDL_ntop (const char* classname, const char* fieldname) { osrfHash* _pos = NULL; if (!oilsIDL_classIsFieldmapper(classname)) return -1; @@ -331,7 +331,7 @@ int oilsIDL_ntop (char* classname, char* fieldname) { return -1; } -char * oilsIDL_pton (char* classname, int pos) { +char * oilsIDL_pton (const char* classname, int pos) { char* ret = NULL; osrfHash* f = NULL; osrfHash* fields = NULL; diff --git a/Open-ILS/src/c-apps/openils/oils_idl.h b/Open-ILS/src/c-apps/openils/oils_idl.h index 0805fa69db..de44f55e34 100644 --- a/Open-ILS/src/c-apps/openils/oils_idl.h +++ b/Open-ILS/src/c-apps/openils/oils_idl.h @@ -5,9 +5,9 @@ #ifndef OILS_IDL_API #define OILS_IDL_API -osrfHash* oilsIDLInit( char* ); -osrfHash* oilsIDL(); -osrfHash* oilsIDLFindPath( char*, ... ); +osrfHash* oilsIDLInit( const char* ); +osrfHash* oilsIDL(void); +osrfHash* oilsIDLFindPath( const char*, ... ); /* The oilsIDL hash looks like this: @@ -44,8 +44,8 @@ osrfHash* oilsIDLFindPath( char*, ... ); */ -int oilsIDL_classIsFieldmapper(char*); -char * oilsIDL_pton(char *, int); -int oilsIDL_ntop(char *, char *); +int oilsIDL_classIsFieldmapper(const char*); +char * oilsIDL_pton(const char *, int); +int oilsIDL_ntop(const char *, const char *); #endif -- 2.11.0