[Openhpi-svn] SF.net SVN: openhpi: [5963] openhpi/branches/2.6.x/src

[<re...@us...>]

Revision: 5963
Author:   renierm
Date:     2006-07-31 10:00:17 -0700 (Mon, 31 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/openhpi/?rev=5963&view=rev

Log Message:
-----------
#1531533 Integrating the init error checking changes from HEAD

Modified Paths:
--------------
    openhpi/branches/2.6.x/openhpid/openhpid.cpp
    openhpi/branches/2.6.x/src/ohpi.c
    openhpi/branches/2.6.x/src/safhpi.c
Modified: openhpi/branches/2.6.x/openhpid/openhpid.cpp
===================================================================
--- openhpi/branches/2.6.x/openhpid/openhpid.cpp	2006-07-31 08:07:31 UTC (rev 5962)
+++ openhpi/branches/2.6.x/openhpid/openhpid.cpp	2006-07-31 17:00:17 UTC (rev 5963)
@@ -278,7 +278,10 @@
                 g_thread_init(NULL);
         }
 
-	oh_init(); // Initialize OpenHPI
+	if (oh_init()) { // Initialize OpenHPI
+		dbg("There was an error initializing OpenHPI");
+		return 8;
+	}
 
 	// create the thread pool
         thrdpool = g_thread_pool_new(service_thread, NULL, max_threads, FALSE, NULL);
@@ -288,7 +291,7 @@
 	if (servinst->Create(port)) {
 		dbg("Error creating server socket.\n");
 		g_thread_pool_free(thrdpool, FALSE, TRUE);
-                	delete servinst;
+                delete servinst;
 		return 8;
 	}
 

Modified: openhpi/branches/2.6.x/src/ohpi.c
===================================================================
--- openhpi/branches/2.6.x/src/ohpi.c	2006-07-31 08:07:31 UTC (rev 5962)
+++ openhpi/branches/2.6.x/src/ohpi.c	2006-07-31 17:00:17 UTC (rev 5963)
@@ -63,6 +63,8 @@
                 dbg("Invalid parameters.");
                 return SA_ERR_HPI_INVALID_PARAMS;
         }
+        
+        if (oh_init()) return SA_ERR_HPI_INTERNAL_ERROR;
 
         if (oh_load_plugin(name))
                 return SA_ERR_HPI_ERROR;
@@ -86,6 +88,8 @@
                 dbg("Invalid parameters.");
                 return SA_ERR_HPI_INVALID_PARAMS;
         }
+        
+        if (oh_init()) return SA_ERR_HPI_INTERNAL_ERROR;
 
         if (oh_unload_plugin(name))
                 return SA_ERR_HPI_ERROR;
@@ -112,6 +116,8 @@
                 dbg("Invalid parameters.");
                 return SA_ERR_HPI_INVALID_PARAMS;
         }
+        
+        if (oh_init()) return SA_ERR_HPI_INTERNAL_ERROR;
 
         p = oh_get_plugin(name);
         if (!p) {
@@ -144,6 +150,8 @@
                 dbg("Invalid parameters.");
                 return SA_ERR_HPI_INVALID_PARAMS;
         }
+        
+        if (oh_init()) return SA_ERR_HPI_INTERNAL_ERROR;
 
         if (oh_getnext_plugin_name(name, next_name, size))
                 return SA_ERR_HPI_NOT_PRESENT;
@@ -175,6 +183,8 @@
                 dbg("Invalid parameters.");
                 return SA_ERR_HPI_INVALID_PARAMS;
         }
+        
+        if (oh_init()) return SA_ERR_HPI_INTERNAL_ERROR;
 
         if (!(hid = oh_create_handler(config))) {
              *id = 0;
@@ -198,6 +208,8 @@
 {
         if (!id)
                 return SA_ERR_HPI_INVALID_PARAMS;
+                
+        if (oh_init()) return SA_ERR_HPI_INTERNAL_ERROR;
 
         if (oh_destroy_handler(id))
                 return SA_ERR_HPI_ERROR;
@@ -221,6 +233,8 @@
         if (!id || !info)
                return SA_ERR_HPI_INVALID_PARAMS;
 
+	if (oh_init()) return SA_ERR_HPI_INTERNAL_ERROR;
+
         h = oh_get_handler(id);
         if (!h) {
                 dbg("Handler %d not found.", id);
@@ -251,6 +265,8 @@
                 dbg("Invalid parameters.");
                 return SA_ERR_HPI_INVALID_PARAMS;
         }
+        
+        if (oh_init()) return SA_ERR_HPI_INTERNAL_ERROR;
 
         if (oh_getnext_handler_id(id, next_id))
                 return SA_ERR_HPI_NOT_PRESENT;
@@ -276,6 +292,8 @@
                 dbg("Invalid parameters. oHpiGlobalParamGet()");
                 return SA_ERR_HPI_INVALID_PARAMS;
         }
+        
+        if (oh_init()) return SA_ERR_HPI_INTERNAL_ERROR;
 
         p.type = param->Type;
 
@@ -304,6 +322,8 @@
                 dbg("Invalid parameters. oHpiGlobalParamSet()");
                 return SA_ERR_HPI_INVALID_PARAMS;
         }
+        
+        if (oh_init()) return SA_ERR_HPI_INTERNAL_ERROR;
 
         p.type = param->Type;
         memcpy(&p.u, &param->u, sizeof(oh_global_param_union));

Modified: openhpi/branches/2.6.x/src/safhpi.c
===================================================================
--- openhpi/branches/2.6.x/src/safhpi.c	2006-07-31 08:07:31 UTC (rev 5962)
+++ openhpi/branches/2.6.x/src/safhpi.c	2006-07-31 17:00:17 UTC (rev 5963)
@@ -58,8 +58,8 @@
                 return SA_ERR_HPI_INVALID_PARAMS;
         }
         
-        /* Initialize Library */
-        oh_init(); /* This will only run once */
+        /* Initialize Library - This will only run once */
+        if (oh_init()) return SA_ERR_HPI_INTERNAL_ERROR;
 
         if (DomainId == SAHPI_UNSPECIFIED_DOMAIN_ID)
                 did = oh_get_default_domain_id();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.