Menu
▾
▴
[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-36-g701ee0f
|
From: Michael Chase-S. <mc...@us...> - 2011-02-28 22:27:03
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCB - Small Footprint CIM Broker".
The branch, master has been updated
via 701ee0f37771e6d40532b206dbee1e880e163952 (commit)
via 1733d684a90d8443682ec0733d806bf71e10b337 (commit)
via c190a3d61f4bac7647897acceb308cbc76ba982b (commit)
via 23b774fa3058db09563f41dbd35905053e5066e4 (commit)
via 126694a00a497ba3d301056494031830b6d9904a (commit)
via 9c2d7d5828897b91a6fbb827fe517f6101a804c6 (commit)
via 3b51f1fef236b9e901775fa0cb61ef0c040ed370 (commit)
from d8eae00ac5f762d2c1407d6a2ce99c64958febac (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 701ee0f37771e6d40532b206dbee1e880e163952
Author: Michael Chase-Salerno <br...@li...>
Date: Mon Feb 28 17:26:22 2011 -0500
create sfcCommon - ID: 3177587
commit 1733d684a90d8443682ec0733d806bf71e10b337
Merge: c190a3d61f4bac7647897acceb308cbc76ba982b d8eae00ac5f762d2c1407d6a2ce99c64958febac
Author: Michael Chase-Salerno <br...@li...>
Date: Mon Feb 28 16:04:25 2011 -0500
Merge branch 'master' into sfcCommon
Conflicts:
dbpAdapter.c
commit c190a3d61f4bac7647897acceb308cbc76ba982b
Author: Michael Chase-Salerno <br...@li...>
Date: Mon Feb 28 12:15:28 2011 -0500
create sfcCommon - ID: 3177587
commit 23b774fa3058db09563f41dbd35905053e5066e4
Author: Michael Chase-Salerno <br...@li...>
Date: Mon Feb 28 11:21:29 2011 -0500
create sfcCommon - ID: 3177587
commit 126694a00a497ba3d301056494031830b6d9904a
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Feb 25 18:16:53 2011 -0500
create sfcCommon - ID: 3177587
commit 9c2d7d5828897b91a6fbb827fe517f6101a804c6
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Feb 25 18:16:19 2011 -0500
create sfcCommon - ID: 3177587
commit 3b51f1fef236b9e901775fa0cb61ef0c040ed370
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Feb 25 17:58:22 2011 -0500
create sfcCommon - ID: 3177587
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 75e162d..a53b018 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-28 Michael Chase-Salerno <br...@li...>
+
+ * Makefile.am, configure.ac, README, most .c files:
+ [ 3177587 ] create sfcCommon library
+
2011-02-23 Chris Buccella <buc...@li...>
* providerDrv.c:
@@ -5,8 +10,8 @@
2011-01-13 Michael Chase-Salerno <br...@li...>
- * ABTScript:
- [ 3152523 ] Changes for footprinting in ABT
+ * ABTScript:
+ [ 3152523 ] Changes for footprinting in ABT
2011-02-18 Narasimha Sharoff <nsh...@us...>
diff --git a/Makefile.am b/Makefile.am
index c6f322d..2d1111b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,6 @@ sfcbconfdir=$(sysconfdir)/sfcb
sfcbstatedir=$(localstatedir)/lib/sfcb
initdir=$(sysconfdir)/init.d
pamdir=$(sysconfdir)/pam.d
-sfcblibdir=$(libdir)/sfcb
cmpilibdir=$(libdir)/cmpi
MANFILES=man/genSslCert.1 man/getSchema.1 man/sfcbd.1 man/sfcbmof.1 \
@@ -36,6 +35,28 @@ MANFILES=man/genSslCert.1 man/getSchema.1 man/sfcbd.1 man/sfcbmof.1 \
BUILT_SOURCES=queryParser.c queryLexer.c sqlParser.c sqlLexer.c cimXmlOps.c cimXmlParserProcessed.c $(MANFILES)
+if SFCCOMMON
+# Use the local sfcCommon libs
+ sfcblibdir=$(libdir)/sfcb
+ SFCCOMMON_LIBS = libsfcUtil.la
+ SFCCOMMON_CPPFLAGS="-I$(srcdir)/sfcUtil"
+ SFCCOMMON_HEADER = sfcUtil/hashtable.h sfcUtil/utilft.h
+libsfcUtil_la_SOURCES = \
+ sfcUtil/hashtable.c \
+ sfcUtil/utilFactory.c \
+ sfcUtil/utilHashtable.c \
+ sfcUtil/utilStringBuffer.c \
+ sfcUtil/libsfcUtil.Versions
+libsfcUtil_la_LDFLAGS = -Wl,--version-script,$(srcdir)/sfcUtil/libsfcUtil.Versions
+libsfcBrokerCore_la_LIBADD=-lsfcUtil
+libsfcBrokerCore_la_DEPENDENCIES=libsfcUtil.la
+else
+# Use shared library
+ sfccommondir=$(includedir)/sfcCommon
+ sfcblibdir=$(libdir)
+libsfcBrokerCore_la_LIBADD=
+endif
+
AM_YFLAGS=-d
AM_CPPFLAGS=-DSFCB_CONFDIR=\"$(sfcbconfdir)\" \
-DSFCB_STATEDIR=\"$(sfcbstatedir)\" \
@@ -43,7 +64,7 @@ AM_CPPFLAGS=-DSFCB_CONFDIR=\"$(sfcbconfdir)\" \
-DCMPI_LIBDIR=\"$(cmpilibdir)\" \
-DLIBDIR=\"$(libdir)\" \
-DSFCB_BINARY=\"$(sbindir)/sfcbd\" \
- -I$(srcdir)/sfcUtil \
+ $(SFCCOMMON_CPPFLAGS) \
@SFCB_CPPFLAGS@ \
@SFCB_CMPI_PLATFORM@
AM_LDFLAGS=@SFCB_LDFLAGS@
@@ -116,8 +137,8 @@ endif
sfcb_sharedobjects = \
$(sfcblibdir)/*.so
+
sfcblib_LTLIBRARIES = \
- libsfcUtil.la \
libsfcBrokerCore.la \
libsfcFileRepository.la \
libsfcInternalProvider.la \
@@ -138,6 +159,7 @@ sfcblib_LTLIBRARIES = \
$(QUALREP_LIBS) \
$(INDICATION_LIBS) \
$(PAM_LIBS) \
+ $(SFCCOMMON_LIBS) \
$(SLP_HOSTNAME_LIBS)
if TEST_ENABLED
@@ -161,13 +183,6 @@ bin_PROGRAMS = \
noinst_PROGRAMS = \
sfcbdumpP32onI32 classSchema2c
-libsfcUtil_la_SOURCES = \
- sfcUtil/hashtable.c \
- sfcUtil/utilFactory.c \
- sfcUtil/utilHashtable.c \
- sfcUtil/utilStringBuffer.c \
- sfcUtil/libsfcUtil.Versions
-libsfcUtil_la_LDFLAGS = -Wl,--version-script,$(srcdir)/sfcUtil/libsfcUtil.Versions
libsfcBrokerCore_la_SOURCES = \
args.c \
@@ -207,8 +222,6 @@ libsfcBrokerCore_la_SOURCES = \
$(QUALREP_FILES)
libsfcBrokerCore_la_CFLAGS = $(AM_CFLAGS) @SFCB_CMPI_OS@
-libsfcBrokerCore_la_LIBADD=-lsfcUtil
-libsfcBrokerCore_la_DEPENDENCIES=libsfcUtil.la
queryLexer.c: $(srcdir)/queryLexer.l
$(LEX) -t $< | sed -e "s/yy/sfcQuery/g" > $@
@@ -316,7 +329,7 @@ libsfcClassProvider_la_DEPENDENCIES=libsfcBrokerCore.la
libsfcClassProviderMem_la_SOURCES = \
classProviderMem.c classSchemaMem.c interop_classSchema.c
-libsfcClassProviderMem_la_LIBADD=-lsfcBrokerCore
+libsfcClassProviderMem_la_LIBADD=-lsfcBrokerCore -lsfcUtil
libsfcClassProviderMem_la_DEPENDENCIES=libsfcBrokerCore.la
# Building providers in the test/TestProviders directory
@@ -405,14 +418,14 @@ sfcbinst2mof_SOURCES=sfcbinst2mof.c
sfcbinst2mof_LDADD = -lsfcFileRepository
classSchema2c_SOURCES=classSchema2c.c
-classSchema2c_LDADD=-lsfcBrokerCore
-classSchema2c_DEPENDENCIES=libsfcBrokerCore.la
+classSchema2c_LDADD=-lsfcBrokerCore -lsfcUtil
+classSchema2c_DEPENDENCIES=libsfcBrokerCore.la
noinst_HEADERS=array.h $(SLP_INC) httpComm.h control.h providerMgr.h \
constClass.h msgqueue.h providerRegister.h \
cimXmlParser.h native.h support.h cimXmlGen.h \
- cimRequest.h cimRsRequest.h genericlist.h objectImpl.h trace.h \
- sfcUtil/hashtable.h sfcUtil/utilft.h mlog.h \
+ cimRequest.h cimRsRequest.h objectImpl.h trace.h \
+ mlog.h $(SFCCOMMON_HEADER) \
cmpiftx.h cmpimacsx.h \
fileRepository.h internalProvider.h \
selectexp.h queryOperation.h \
diff --git a/NEWS b/NEWS
index b1f15d6..f4a8412 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Changes in 1.4.1
New features:
- 3152523 Changes for footprinting in ABT
- 1596336 Add config option for network interface binding
+- 3177587 create sfcCommon library
Bugs fixed:
diff --git a/README b/README
index ff1b2bb..a98707b 100644
--- a/README
+++ b/README
@@ -327,6 +327,11 @@ Options:
This option may require the GNU_SOURCE compiler flag if
building under glibc 2.8+. (CFLAGS=-D_GNU_SOURCE ./configure)
+ --disable-sfcCommon
+ Disables the sfcCommon libraries included in SFCB and uses
+ the installed shared library.
+ Default=enabled (local libraries used)
+
9. Downloading the CIM Schema
=============================
diff --git a/brokerEnc.c b/brokerEnc.c
index 4fa43ad..fce11d1 100644
--- a/brokerEnc.c
+++ b/brokerEnc.c
@@ -23,7 +23,13 @@
#include "native.h"
#include "trace.h"
#include "constClass.h"
+
+#include "config.h"
+#ifdef SFCCOMMON
#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
extern const char *opGetClassNameChars(const CMPIObjectPath * cop);
extern const char *opGetNameSpaceChars(const CMPIObjectPath * cop);
diff --git a/brokerUpc.c b/brokerUpc.c
index 02331f8..12228a9 100644
--- a/brokerUpc.c
+++ b/brokerUpc.c
@@ -24,14 +24,18 @@
#include "support.h"
#include "native.h"
-#include "utilft.h"
#include "providerMgr.h"
#include "providerRegister.h"
#include "objectImpl.h"
#include "msgqueue.h"
-#include "utilft.h"
#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef HAVE_INDICATIONS
#define SFCB_INCL_INDICATION_SUPPORT 1
#endif
diff --git a/cimRequest.c b/cimRequest.c
index 5008485..3e50c2b 100644
--- a/cimRequest.c
+++ b/cimRequest.c
@@ -45,13 +45,19 @@
#include "native.h"
#include "trace.h"
-#include "utilft.h"
#include "string.h"
#include "queryOperation.h"
#include "config.h"
#include "control.h"
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef SFCB_IX86
#define SFCB_ASM(x) asm(x)
#else
diff --git a/cimXmlGen.c b/cimXmlGen.c
index 46970b8..c3cf118 100644
--- a/cimXmlGen.c
+++ b/cimXmlGen.c
@@ -29,12 +29,17 @@
#include "native.h"
#include "trace.h"
-#include "utilft.h"
#include "string.h"
#include "queryOperation.h"
#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef SFCB_IX86
#define SFCB_ASM(x) asm(x)
#else
diff --git a/cimXmlGen.h b/cimXmlGen.h
index 44537c6..e3fe9dd 100644
--- a/cimXmlGen.h
+++ b/cimXmlGen.h
@@ -30,9 +30,15 @@
#include "native.h"
#include "trace.h"
-#include "utilft.h"
#include "string.h"
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#include "queryOperation.h"
extern CMPIValue *getKeyValueTypePtr(char *type, char *value,
diff --git a/classProviderCommon.h b/classProviderCommon.h
index 04a168a..3676ead 100644
--- a/classProviderCommon.h
+++ b/classProviderCommon.h
@@ -19,7 +19,6 @@
*
*/
-#include "utilft.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -27,6 +26,13 @@
#include <sys/types.h>
#include <dirent.h>
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#include "constClass.h"
#include "providerRegister.h"
#include "trace.h"
diff --git a/classSchema2c.c b/classSchema2c.c
index e340e12..e48ea32 100644
--- a/classSchema2c.c
+++ b/classSchema2c.c
@@ -20,7 +20,6 @@
*
*/
-#include "utilft.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -34,6 +33,13 @@
#include "trace.h"
#include "control.h"
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#define NEW(x) ((x *) malloc(sizeof(x)))
#include "cmpi/cmpidt.h"
diff --git a/configure.ac b/configure.ac
index a7550cc..a4ab862 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,13 @@ AC_ARG_ENABLE(request-types,
[AC_HELP_STRING([--enable-request-types(=TYPES)],
[Enable support of listed request types. If none are listed, all are enabled.])])
+AC_ARG_ENABLE(sfcCommon,
+ [AC_HELP_STRING([--disable-sfcCommon],
+ [Disable local sfcCommon libraries and use shared version.])],
+ [enable_sfcCommon=$enableval],
+ [enable_sfcCommon="yes"]
+ )
+
# Size checks
AC_CHECK_SIZEOF(void*)
AC_CHECK_SIZEOF(int)
@@ -226,6 +233,7 @@ AM_CONDITIONAL(CMDTEST,[test "$test_cmd" == "yes"])
AM_CONDITIONAL(SLPTEST,[test "$test_slp" == "yes"])
AM_CONDITIONAL(PROVTEST,[test "$test_providers" == "yes"])
AM_CONDITIONAL(PROVTEST,[test "$test_local" == "yes"])
+
if [test "$enable_tests"]; then
# The order of TEST_SUBDIRS determines test
# execution order.
@@ -328,6 +336,12 @@ if test "$handler_CIMRS" == "yes"; then
fi
# End of parser config
+if test "$enable_sfcCommon" == "yes"; then
+ AC_DEFINE(SFCCOMMON,,[Local sfcCommon enabled])
+else
+ AC_CHECK_LIB(sfcUtil,main,,[AC_MSG_ERROR([Could not find required sfcUtil])])
+fi
+
if test "$enable_uds" == "yes"; then
AC_DEFINE(HAVE_UDS,,[UDS authentication enabled])
fi
@@ -420,6 +434,7 @@ fi
# Checks for libraries.
AC_CHECK_LIB(pthread,main)
AC_CHECK_LIB(dl,main)
+
AC_CHECK_LIB(z,main,[SFCB_LIBZ=-lz],[AC_MSG_ERROR([Could not find required libz])])
if test "$enable_indications" = "yes" ; then
LOAD_INDICATION_PROVIDER=
@@ -531,6 +546,7 @@ AM_CONDITIONAL(DOCS,[test "$enable_docs" == "yes"])
AM_CONDITIONAL(IPV6,[test "$enable_ipv6" == "yes"])
AM_CONDITIONAL(LOCAL_CONNECT_NO_INDICATION,[test "$enable_local_connect_only" == "yes" -a "$enable_indications" == "no"])
AM_CONDITIONAL(LOCAL_CONNECT_ONLY,[test "$enable_local_connect_only" == "yes"])
+AM_CONDITIONAL(SFCCOMMON,[test "$enable_sfcCommon" == "yes"])
AC_CONFIG_FILES([Makefile sfcb.spec sfcbrepos.sh sfcbstage.sh sfcbunstage.sh
sfcbuuid.sh sfcb.cfg.pre getSchema.sh.pre
@@ -558,6 +574,7 @@ echo -e "uds"\\t\\t\\t\\t"${enable_uds:-no}"
echo -e "tests"\\t\\t\\t\\t"${enable_tests:-no}"
echo -e "debug"\\t\\t\\t\\t"${enable_debug:-no}"
echo -e "Request types"\\t\\t\\t"${enable_request_types}"
+echo -e "Local sfcCommon"\\t\\t\\t"${enable_sfcCommon}"
echo =================================================================
echo
echo "sfcb configuration complete. you may now run 'make'"
diff --git a/control.c b/control.c
index c632b8c..a26f6d3 100644
--- a/control.c
+++ b/control.c
@@ -19,7 +19,6 @@
*
*/
-#include "utilft.h"
#include "support.h"
#include "mlog.h"
#include <stdio.h>
@@ -32,6 +31,12 @@
#include "config.h"
#endif
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifndef SFCB_CONFDIR
#define SFCB_CONFDIR "/etc/sfcb"
#endif
diff --git a/elementCapabilitiesProvider.c b/elementCapabilitiesProvider.c
index db83b25..40e8539 100644
--- a/elementCapabilitiesProvider.c
+++ b/elementCapabilitiesProvider.c
@@ -25,7 +25,6 @@
*
*/
-#include "utilft.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -41,6 +40,12 @@
#include "control.h"
#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#define NEW(x) ((x *) malloc(sizeof(x)))
#include "cmpi/cmpidt.h"
diff --git a/fileRepository.h b/fileRepository.h
index f31dff7..2c6a2df 100644
--- a/fileRepository.h
+++ b/fileRepository.h
@@ -19,7 +19,13 @@
*
*/
#include <stdio.h>
-#include "sfcUtil/utilft.h"
+
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
#ifndef _FILEREPOSITORY_
#define _FILEREPOSITORY_
diff --git a/genericlist.h b/genericlist.h
index eeb3cc0..cb17038 100644
--- a/genericlist.h
+++ b/genericlist.h
@@ -36,7 +36,12 @@
#ifndef GENERIC_LIST_DEFINED
#define GENERIC_LIST_DEFINED
+#include "config.h"
+#ifdef SFCCOMMON
#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
typedef struct GLE_struct {
void *pointer;
diff --git a/httpAdapter.c b/httpAdapter.c
index 9e5193a..7504b1b 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -41,11 +41,17 @@
#include "cmpi/cmpidt.h"
#include "msgqueue.h"
-#include "utilft.h"
#include "trace.h"
#include "cimRequest.h"
#include "support.h"
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#include <pthread.h>
#include <semaphore.h>
diff --git a/indCIMXMLExport.c b/indCIMXMLExport.c
index 0bf28ca..03eb856 100644
--- a/indCIMXMLExport.c
+++ b/indCIMXMLExport.c
@@ -20,10 +20,16 @@
*/
#include <curl/curl.h>
-#include "utilft.h"
#include "trace.h"
#include <string.h>
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
extern UtilStringBuffer *newStringBuffer(int);
extern int getControlChars(char *id, char **val);
diff --git a/instance.c b/instance.c
index 0a034ff..ae548e8 100644
--- a/instance.c
+++ b/instance.c
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include <string.h>
-#include "utilft.h"
#include "native.h"
#include "instance.h"
@@ -31,6 +30,12 @@
#include "providerMgr.h"
#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef SFCB_IX86
#define SFCB_ASM(x) asm(x)
#else
diff --git a/internalProvider.c b/internalProvider.c
index 7faf646..5fded91 100644
--- a/internalProvider.c
+++ b/internalProvider.c
@@ -29,13 +29,19 @@
#include <ctype.h>
#include "providerRegister.h"
#include "fileRepository.h"
-#include "utilft.h"
#include "trace.h"
#include "constClass.h"
#include "internalProvider.h"
#include "native.h"
#include "objectpath.h"
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#define LOCALCLASSNAME "InternalProvider"
static char *interopNs = "root/interop";
diff --git a/internalProvider.h b/internalProvider.h
index d3b242f..da2ee3a 100644
--- a/internalProvider.h
+++ b/internalProvider.h
@@ -23,7 +23,13 @@
#ifndef INTERNAL_PROVIDER_H
#define INTERNAL_PROVIDER_H
+#include "config.h"
+#ifdef SFCCOMMON
#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#include "cmpi/cmpidt.h"
CMPIStatus InternalProviderEnumInstanceNames(CMPIInstanceMI * mi,
diff --git a/interopProvider.c b/interopProvider.c
index 732608a..2f7f648 100644
--- a/interopProvider.c
+++ b/interopProvider.c
@@ -27,7 +27,6 @@
#include <string.h>
#include <ctype.h>
#include "fileRepository.h"
-#include "utilft.h"
#include "trace.h"
#include "queryOperation.h"
#include "providerMgr.h"
@@ -37,6 +36,13 @@
#include <time.h>
#include "instance.h"
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#define LOCALCLASSNAME "InteropProvider"
/*
diff --git a/interopServerProvider.c b/interopServerProvider.c
index 8e66ce5..2a0d8b7 100644
--- a/interopServerProvider.c
+++ b/interopServerProvider.c
@@ -19,7 +19,6 @@
*
*/
-#include "utilft.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -35,6 +34,12 @@
#include "control.h"
#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#define NEW(x) ((x *) malloc(sizeof(x)))
#include "cmpi/cmpidt.h"
diff --git a/objectImpl.c b/objectImpl.c
index 6f18cc3..928d8e7 100644
--- a/objectImpl.c
+++ b/objectImpl.c
@@ -27,10 +27,15 @@
#include "objectImpl.h"
#include "array.h"
-#include "utilft.h"
#include "trace.h"
#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef SFCB_IX86
#define SFCB_ASM(x) asm(x)
#else
diff --git a/objectImplSwapI32toP32.c b/objectImplSwapI32toP32.c
index fb2f7a7..8b7c68f 100644
--- a/objectImplSwapI32toP32.c
+++ b/objectImplSwapI32toP32.c
@@ -24,9 +24,15 @@
#include <byteswap.h>
#include <stdio.h>
#include <stdlib.h>
-#include "utilft.h"
#include <sys/utsname.h>
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef SETCLPFX
#undef SETCLPFX
#endif
diff --git a/objectpath.c b/objectpath.c
index a6a71fc..3c8ab25 100644
--- a/objectpath.c
+++ b/objectpath.c
@@ -29,7 +29,13 @@
#include "native.h"
#include "msgqueue.h"
+
+#include "config.h"
+#ifdef SFCCOMMON
#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
extern UtilStringBuffer *newStringBuffer(int s);
diff --git a/objectpath.h b/objectpath.h
index 0dce5fb..50c796e 100644
--- a/objectpath.h
+++ b/objectpath.h
@@ -21,7 +21,12 @@
#ifndef _OBJECTPATH_H
#define _OBJECTPATH_H
+#include "config.h"
+#ifdef SFCCOMMON
#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
UtilStringBuffer *normalizeObjectPathStrBuf(const CMPIObjectPath * cop);
char *normalizeObjectPathChars(const CMPIObjectPath * cop);
diff --git a/profileProvider.c b/profileProvider.c
index 532eded..664a668 100644
--- a/profileProvider.c
+++ b/profileProvider.c
@@ -29,7 +29,6 @@
#include <string.h>
#include <ctype.h>
#include "fileRepository.h"
-#include "utilft.h"
#include "trace.h"
#include "providerMgr.h"
#include "internalProvider.h"
@@ -37,6 +36,13 @@
#include "objectpath.h"
#include <time.h>
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef HAVE_SLP
#include <slp.h>
#include "cimslpCMPI.h"
diff --git a/providerDrv.c b/providerDrv.c
index 36ed3cf..a801c29 100644
--- a/providerDrv.c
+++ b/providerDrv.c
@@ -31,7 +31,6 @@
#include "cmpi/cmpidt.h"
#include "providerMgr.h"
#include "providerRegister.h"
-#include "utilft.h"
#include "cimXmlParser.h"
#include "support.h"
#include "msgqueue.h"
@@ -43,6 +42,12 @@
#include "config.h"
#include "constClass.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef HAVE_QUALREP
#include "qualifier.h"
#endif
diff --git a/providerMgr.c b/providerMgr.c
index 7be2cb2..88469fd 100644
--- a/providerMgr.c
+++ b/providerMgr.c
@@ -27,7 +27,6 @@
#include "cmpi/cmpidt.h"
#include "providerRegister.h"
#include "providerMgr.h"
-#include "utilft.h"
#include "msgqueue.h"
#include "constClass.h"
#include "cimXmlParser.h"
@@ -38,6 +37,12 @@
#include "selectexp.h"
#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef HAVE_QUALREP
#include "qualifier.h"
#endif
diff --git a/providerRegister.c b/providerRegister.c
index 2e98f27..fd7ff7e 100644
--- a/providerRegister.c
+++ b/providerRegister.c
@@ -20,7 +20,6 @@
*
*/
-#include "utilft.h"
#include "mlog.h"
#include <stdio.h>
#include <stdlib.h>
@@ -29,6 +28,13 @@
#include <support.h>
#include <pwd.h>
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#include "providerRegister.h"
static ProviderInfo forceNotFound = { "", FORCE_PROVIDER_NOTFOUND };
diff --git a/providerRegister.h b/providerRegister.h
index 88f4316..ef4e10b 100644
--- a/providerRegister.h
+++ b/providerRegister.h
@@ -28,11 +28,17 @@
#include "cmpi/cmpift.h"
#include "cmpiftx.h"
#include "msgqueue.h"
-#include "utilft.h"
#include "providerMgr.h"
#include <time.h>
#include <pwd.h>
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/result.c b/result.c
index 6521279..3f144bf 100644
--- a/result.c
+++ b/result.c
@@ -24,10 +24,16 @@
#include "providerMgr.h"
#include "constClass.h"
#include "queryOperation.h"
-#include "utilft.h"
#include "objectImpl.h"
#include "mlog.h"
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
extern void native_array_reset_size(CMPIArray *array,
CMPICount increment);
extern MsgSegment setInstanceMsgSegment(CMPIInstance *ci);
diff --git a/sfcBroker.c b/sfcBroker.c
index 34972b2..6c114eb 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -22,7 +22,14 @@
#include <stdio.h>
#include "native.h"
+
+#include "config.h"
+#ifdef SFCCOMMON
#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#include "string.h"
#include "cimXmlParser.h"
// #include "brokerOs.c"
diff --git a/sqlParser.y b/sqlParser.y
index 573dce3..e61948d 100644
--- a/sqlParser.y
+++ b/sqlParser.y
@@ -34,7 +34,13 @@
#include <errno.h>
#include "queryOperation.h"
#include "sqlStatement.h"
+
+#include "config.h"
+#ifdef SFCCOMMON
#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
#define YYPARSE_PARAM parm
#define YYLEX_PARAM parm
diff --git a/sqlStatement.c b/sqlStatement.c
old mode 100755
new mode 100644
index d7e78a0..825e5f7
--- a/sqlStatement.c
+++ b/sqlStatement.c
@@ -20,7 +20,6 @@
*/
#include "sqlStatement.h"
-#include "utilft.h"
#include "cimXmlParser.h" // Provider operationen
#include "cmpi/cmpidt.h"
@@ -29,6 +28,12 @@
#include "cmpi/cmpimacs.h"
#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#include <stdio.h>
#include <string.h>
#include <malloc.h>
diff --git a/sqlStatement.h b/sqlStatement.h
index 2b47a80..89dcb42 100644
--- a/sqlStatement.h
+++ b/sqlStatement.h
@@ -19,11 +19,16 @@
*
*/
-#include "utilft.h"
-
#include "cmpi/cmpimacs.h"
#include "avltree.h"
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#define DEFAULTDB "root/cimv2"
/*
* SqlStatement.type:
diff --git a/support.c b/support.c
index 3d3a1ee..f08b5c8 100644
--- a/support.c
+++ b/support.c
@@ -720,7 +720,13 @@ releaseHeap(void *hc)
_SFCB_EXIT();
}
+#include "config.h"
+#ifdef SFCCOMMON
#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#include "providerRegister.h"
ProviderRegister *pReg = NULL;
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
