[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-416-gfd7a4c1

[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  fd7a4c15964ab0f939cf6f65f432d53902a90722 (commit)
       via  c020fb5a81f94294500d6cfa86be2d64ae98fca5 (commit)
      from  3217f32e703aaa1d624fe7d1720e7098f2b63a4f (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 fd7a4c15964ab0f939cf6f65f432d53902a90722
Author: buccella <buc...@li...>
Date:   Thu Mar 28 14:52:10 2013 -0400

    sfcbmacs.h missing from Makefile

commit c020fb5a81f94294500d6cfa86be2d64ae98fca5
Author: buccella <buc...@li...>
Date:   Thu Mar 28 13:08:23 2013 -0400

    cleanup some compiler warnings

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

Summary of changes:
 Makefile.am           |    2 +-
 classProviderCommon.c |    5 ++-
 interopProvider.c     |    1 -
 providerDrv.c         |   95 +++++++++++++++++++++++-------------------------
 4 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d5d43ea..63bcaba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -380,7 +380,7 @@ noinst_HEADERS=array.h $(SLP_INC) httpComm.h control.h    providerMgr.h \
 	selectexp.h queryOperation.h \
 	sfcVersion.h mrwlock.h avltree.h \
         cimcClientSfcbLocal.h $(QUALREP_HEADER) cmpidtx.h classSchemaMem.h \
-        objectpath.h instance.h $(SLP_HEADER) classProviderCommon.h
+        objectpath.h instance.h $(SLP_HEADER) classProviderCommon.h sfcbmacs.h
 
 man_MANS=$(MANFILES)
 
diff --git a/classProviderCommon.c b/classProviderCommon.c
index 0f5434f..494c07b 100644
--- a/classProviderCommon.c
+++ b/classProviderCommon.c
@@ -1,4 +1,7 @@
-#include "classProviderCommon.h"
+#include <string.h>
+#include "objectImpl.h"
+#include "constClass.h"
+#include "trace.h"
 
 //candidate for sfcCommon
 int contained_list(const char **list, const char *name)
diff --git a/interopProvider.c b/interopProvider.c
index aba28df..c6dc5bf 100644
--- a/interopProvider.c
+++ b/interopProvider.c
@@ -1682,7 +1682,6 @@ InteropProviderInvokeMethod(CMPIMethodMI * mi,
   else if (strcasecmp(methodName, "_getHandler") == 0) {
     // Return a handler instance from the hashtable
     CMPIObjectPath *op = CMGetArg(in, "handler", &st).value.ref;
-    CMPIString *ops=op->ft->toString(op,NULL);
     char *key = normalizeObjectPathCharsDup(op);
     Handler *ha = getHandler(key);
 
diff --git a/providerDrv.c b/providerDrv.c
index 4a38828..8530c9c 100644
--- a/providerDrv.c
+++ b/providerDrv.c
@@ -161,9 +161,6 @@ static int      idleThreadStartHandled = 0;
 
 ProviderInfo   *activProvs = NULL;
 
-static void increaseInUseSem(int id);
-static void decreaseInUseSem(int id);
-
 unsigned long   provSampleInterval = 10;
 unsigned long   provTimeoutInterval = 25;
 unsigned        provAutoGroup = 0;
@@ -378,52 +375,6 @@ stopNextProc()
    return count;
  }
 
- static void increaseInUseSem(int id)
- {
-   _SFCB_ENTER(TRACE_PROVIDERDRV, "increaseInUseSem");
-  
-   if (semAcquireUnDo(sfcbSem,PROV_GUARD(id))) {
-     mlogf(M_ERROR,M_SHOW,"-#- Fatal error acquiring semaphore for %d, reason: %s\n",
-           id, strerror(errno));
-     _SFCB_ABORT();
-   }
-   if (semReleaseUnDo(sfcbSem,PROV_INUSE(id))) {
-     mlogf(M_ERROR,M_SHOW,"-#- Fatal error increasing inuse semaphore for %d, reason: %s\n",
-           id, strerror(errno));
-     _SFCB_ABORT();
-   }
-   if (semReleaseUnDo(sfcbSem,PROV_GUARD(id))) {
-     mlogf(M_ERROR,M_SHOW,"-#- Fatal error releasing semaphore for %d, reason: %s\n",
-           id, strerror(errno));
-     _SFCB_ABORT();
-   }
-   _SFCB_EXIT();
- }
-
- static void decreaseInUseSem(int id)
- {
-   _SFCB_ENTER(TRACE_PROVIDERDRV, "decreaseInUseSem");
-  
-   if (semAcquireUnDo(sfcbSem,PROV_GUARD(id))) {
-     mlogf(M_ERROR,M_SHOW,"-#- Fatal error acquiring semaphore for %d, reason: %s\n",
-           id, strerror(errno));
-     _SFCB_ABORT();
-   }
-   if (semGetValue(sfcbSem,PROV_INUSE(id)) > 0) {
-     if (semAcquireUnDo(sfcbSem,PROV_INUSE(id))) {
-       mlogf(M_ERROR,M_SHOW,"-#- Fatal error decreasing inuse semaphore for %d, reason: %s\n",
-             id, strerror(errno));
-       _SFCB_ABORT();
-     }
-   }
-   if (semReleaseUnDo(sfcbSem,PROV_GUARD(id))) {
-     mlogf(M_ERROR,M_SHOW,"-#- Fatal error releasing semaphore for %d, reason: %s\n",
-           id, strerror(errno));
-     _SFCB_ABORT();
-   }
-   _SFCB_EXIT();
- }
-
  typedef struct _provLibAndTypes {
    void* lib;
 #define INST  1
@@ -2669,6 +2620,52 @@ referenceNames(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
 
 #ifdef SFCB_INCL_INDICATION_SUPPORT
 
+ static void increaseInUseSem(int id)
+ {
+   _SFCB_ENTER(TRACE_PROVIDERDRV, "increaseInUseSem");
+
+   if (semAcquireUnDo(sfcbSem,PROV_GUARD(id))) {
+     mlogf(M_ERROR,M_SHOW,"-#- Fatal error acquiring semaphore for %d, reason: %s\n",
+           id, strerror(errno));
+     _SFCB_ABORT();
+   }
+   if (semReleaseUnDo(sfcbSem,PROV_INUSE(id))) {
+     mlogf(M_ERROR,M_SHOW,"-#- Fatal error increasing inuse semaphore for %d, reason: %s\n",
+           id, strerror(errno));
+     _SFCB_ABORT();
+   }
+   if (semReleaseUnDo(sfcbSem,PROV_GUARD(id))) {
+     mlogf(M_ERROR,M_SHOW,"-#- Fatal error releasing semaphore for %d, reason: %s\n",
+           id, strerror(errno));
+     _SFCB_ABORT();
+   }
+   _SFCB_EXIT();
+ }
+
+ static void decreaseInUseSem(int id)
+ {
+   _SFCB_ENTER(TRACE_PROVIDERDRV, "decreaseInUseSem");
+
+   if (semAcquireUnDo(sfcbSem,PROV_GUARD(id))) {
+     mlogf(M_ERROR,M_SHOW,"-#- Fatal error acquiring semaphore for %d, reason: %s\n",
+           id, strerror(errno));
+     _SFCB_ABORT();
+   }
+   if (semGetValue(sfcbSem,PROV_INUSE(id)) > 0) {
+     if (semAcquireUnDo(sfcbSem,PROV_INUSE(id))) {
+       mlogf(M_ERROR,M_SHOW,"-#- Fatal error decreasing inuse semaphore for %d, reason: %s\n",
+             id, strerror(errno));
+       _SFCB_ABORT();
+     }
+   }
+   if (semReleaseUnDo(sfcbSem,PROV_GUARD(id))) {
+     mlogf(M_ERROR,M_SHOW,"-#- Fatal error releasing semaphore for %d, reason: %s\n",
+           id, strerror(errno));
+     _SFCB_ABORT();
+   }
+   _SFCB_EXIT();
+ }
+
 static BinResponseHdr *
 activateFilter(BinRequestHdr * hdr, ProviderInfo * info, int __attribute__ ((unused)) requestor)
 {


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker