[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-50-gf4cd1f2

[Chris B. <buc...@us...>]

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  f4cd1f275e4567f3b497a44f46f602882a2535f1 (commit)
       via  10e7102a323ea527ba896a5564a78aeb6399fc41 (commit)
      from  8a8be75dd2e7bdaa03b51764dd4fcc65b2895a86 (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 f4cd1f275e4567f3b497a44f46f602882a2535f1
Author: buccella <buc...@li...>
Date:   Fri Apr 1 22:38:45 2011 -0400

    Revert "create sfcCommon - ID: 3177587"
    
    This reverts commit 126694a00a497ba3d301056494031830b6d9904a. (undo utilft.h include change)

commit 10e7102a323ea527ba896a5564a78aeb6399fc41
Author: buccella <buc...@li...>
Date:   Fri Apr 1 22:38:05 2011 -0400

    Revert "create sfcCommon - ID: 3177587"
    
    This reverts commit 3b51f1fef236b9e901775fa0cb61ef0c040ed370. (undo utilft.h include change)
    
    Conflicts:
    
    	dbpAdapter.c

-----------------------------------------------------------------------

Summary of changes:
diff --git a/brokerEnc.c b/brokerEnc.c
index fce11d1..4fa43ad 100644
--- a/brokerEnc.c
+++ b/brokerEnc.c
@@ -23,13 +23,7 @@
 #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 12228a9..02331f8 100644
--- a/brokerUpc.c
+++ b/brokerUpc.c
@@ -24,17 +24,13 @@
 
 #include "support.h"
 #include "native.h"
+#include "utilft.h"
 #include "providerMgr.h"
 #include "providerRegister.h"
 #include "objectImpl.h"
 #include "msgqueue.h"
-#include "config.h"
-
-#ifdef SFCCOMMON
 #include "utilft.h"
-#else
-#include <sfcCommon/utilft.h>
-#endif
+#include "config.h"
 
 #ifdef HAVE_INDICATIONS
 #define SFCB_INCL_INDICATION_SUPPORT 1
diff --git a/cimRequest.c b/cimRequest.c
index 3e50c2b..5008485 100644
--- a/cimRequest.c
+++ b/cimRequest.c
@@ -45,19 +45,13 @@
 
 #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 16deb25..e8a237f 100644
--- a/cimXmlGen.c
+++ b/cimXmlGen.c
@@ -29,17 +29,12 @@
 
 #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/classSchema2c.c b/classSchema2c.c
index e48ea32..e340e12 100644
--- a/classSchema2c.c
+++ b/classSchema2c.c
@@ -20,6 +20,7 @@
  *
  */
 
+#include "utilft.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -33,13 +34,6 @@
 #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/control.c b/control.c
index a26f6d3..c632b8c 100644
--- a/control.c
+++ b/control.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include "utilft.h"
 #include "support.h"
 #include "mlog.h"
 #include <stdio.h>
@@ -31,12 +32,6 @@
 #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 4964325..9018b31 100644
--- a/elementCapabilitiesProvider.c
+++ b/elementCapabilitiesProvider.c
@@ -25,6 +25,7 @@
  *
  */
 
+#include "utilft.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -40,12 +41,6 @@
 #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/httpAdapter.c b/httpAdapter.c
index 072d126..55cff9b 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -41,17 +41,11 @@
 
 #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 03eb856..0bf28ca 100644
--- a/indCIMXMLExport.c
+++ b/indCIMXMLExport.c
@@ -20,16 +20,10 @@
  */
 
 #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 ae548e8..0a034ff 100644
--- a/instance.c
+++ b/instance.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "utilft.h"
 #include "native.h"
 #include "instance.h"
 
@@ -30,12 +31,6 @@
 #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 5fded91..7faf646 100644
--- a/internalProvider.c
+++ b/internalProvider.c
@@ -29,19 +29,13 @@
 #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/interopProvider.c b/interopProvider.c
index 438d481..552f93c 100644
--- a/interopProvider.c
+++ b/interopProvider.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <ctype.h>
 #include "fileRepository.h"
+#include "utilft.h"
 #include "trace.h"
 #include "queryOperation.h"
 #include "providerMgr.h"
@@ -36,13 +37,6 @@
 #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 2a0d8b7..8e66ce5 100644
--- a/interopServerProvider.c
+++ b/interopServerProvider.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include "utilft.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -34,12 +35,6 @@
 #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 928d8e7..6f18cc3 100644
--- a/objectImpl.c
+++ b/objectImpl.c
@@ -27,15 +27,10 @@
 
 #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 8b7c68f..fb2f7a7 100644
--- a/objectImplSwapI32toP32.c
+++ b/objectImplSwapI32toP32.c
@@ -24,14 +24,8 @@
 #include <byteswap.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/utsname.h>
-
-#include "config.h"
-#ifdef SFCCOMMON
 #include "utilft.h"
-#else
-#include <sfcCommon/utilft.h>
-#endif
+#include <sys/utsname.h>
 
 #ifdef SETCLPFX
 #undef SETCLPFX
diff --git a/objectpath.c b/objectpath.c
index 3c8ab25..a6a71fc 100644
--- a/objectpath.c
+++ b/objectpath.c
@@ -29,13 +29,7 @@
 
 #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/profileProvider.c b/profileProvider.c
index 664a668..532eded 100644
--- a/profileProvider.c
+++ b/profileProvider.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <ctype.h>
 #include "fileRepository.h"
+#include "utilft.h"
 #include "trace.h"
 #include "providerMgr.h"
 #include "internalProvider.h"
@@ -36,13 +37,6 @@
 #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 a801c29..36ed3cf 100644
--- a/providerDrv.c
+++ b/providerDrv.c
@@ -31,6 +31,7 @@
 #include "cmpi/cmpidt.h"
 #include "providerMgr.h"
 #include "providerRegister.h"
+#include "utilft.h"
 #include "cimXmlParser.h"
 #include "support.h"
 #include "msgqueue.h"
@@ -42,12 +43,6 @@
 #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 88469fd..7be2cb2 100644
--- a/providerMgr.c
+++ b/providerMgr.c
@@ -27,6 +27,7 @@
 #include "cmpi/cmpidt.h"
 #include "providerRegister.h"
 #include "providerMgr.h"
+#include "utilft.h"
 #include "msgqueue.h"
 #include "constClass.h"
 #include "cimXmlParser.h"
@@ -37,12 +38,6 @@
 #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 fd7ff7e..2e98f27 100644
--- a/providerRegister.c
+++ b/providerRegister.c
@@ -20,6 +20,7 @@
  *
  */
 
+#include "utilft.h"
 #include "mlog.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,13 +29,6 @@
 #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/result.c b/result.c
index 3f144bf..6521279 100644
--- a/result.c
+++ b/result.c
@@ -24,16 +24,10 @@
 #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 6c114eb..34972b2 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -22,14 +22,7 @@
 
 #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 e61948d..573dce3 100644
--- a/sqlParser.y
+++ b/sqlParser.y
@@ -34,13 +34,7 @@
 #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 100644
new mode 100755
index 825e5f7..d7e78a0
--- a/sqlStatement.c
+++ b/sqlStatement.c
@@ -20,6 +20,7 @@
  */
 
 #include "sqlStatement.h"
+#include "utilft.h"
 
 #include "cimXmlParser.h"       // Provider operationen
 #include "cmpi/cmpidt.h"
@@ -28,12 +29,6 @@
 #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/support.c b/support.c
index f08b5c8..3d3a1ee 100644
--- a/support.c
+++ b/support.c
@@ -720,13 +720,7 @@ 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