Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.2
libHBAAPI2
libHBAAPI-build-fixes
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File libHBAAPI-build-fixes of Package libHBAAPI2
diff --git a/HBAAPILIB.c b/HBAAPILIB.c index 9a4b09f..205b6ca 100644 --- a/HBAAPILIB.c +++ b/HBAAPILIB.c @@ -399,7 +399,7 @@ local_remove_callback(HBA_CALLBACKHANDLE cbhandle) { GRAB_MUTEX(&_hbaapi_APSE_mutex); GRAB_MUTEX(&_hbaapi_TE_mutex); GRAB_MUTEX(&_hbaapi_LE_mutex); - for(listp = cb_lists_array, found = 0; found == 0, *listp != NULL; listp++) { + for(listp = cb_lists_array, found = 0; found == 0 && *listp != NULL; listp++) { lastp = *listp; for(cbp=**listp; cbp != NULL; cbp = cbp->next) { if(cbhandle != (HBA_CALLBACKHANDLE)cbp) { @@ -459,12 +459,6 @@ local_remove_callback(HBA_CALLBACKHANDLE cbhandle) { return(status); } -static char wwn_str1[17]; -static char wwn_str2[17]; -static char wwn_str3[17]; -#define WWN2STR1(wwn) WWN2str(wwn_str1, (wwn)) -#define WWN2STR2(wwn) WWN2str(wwn_str2, (wwn)) -#define WWN2STR3(wwn) WWN2str(wwn_str3, (wwn)) static char * WWN2str(char *buf, HBA_WWN *wwn) { int j; @@ -476,6 +470,11 @@ WWN2str(char *buf, HBA_WWN *wwn) { return(buf); } +static char wwn_str1[17]; +static char wwn_str2[17]; +#define WWN2STR1(wwn) WWN2str(wwn_str1, (wwn)) +#define WWN2STR2(wwn) WWN2str(wwn_str2, (wwn)) + #ifdef WIN32 BOOL APIENTRY @@ -1011,10 +1010,10 @@ HBA_GetNumberOfAdapters() { } num_adapters = ((GetNumberOfAdaptersFunc)()); #ifndef WIN32 - DEBUG(1, "HBAAPI: num_adapters for %s = %d\n", + DEBUG(1, "HBAAPI: num_adapters for %s = %lu\n", lib_infop->LibraryName, num_adapters, 0); #else - DEBUG(1, "HBAAPI: num_adapters for %s = %d\n", + DEBUG(1, "HBAAPI: num_adapters for %s = %d\n", lib_infop->LibraryPath, num_adapters, 0); #endif @@ -1344,7 +1343,7 @@ HBA_RegisterForAdapterAddEvents ( HBA_ALLADAPTERSCALLBACK_ELEM *cbp; HBA_VENDORCALLBACK_ELEM *vcbp; HBA_VENDORCALLBACK_ELEM *vendorhandlelist; - HBARegisterForAdapterAddEventsFunc registeredfunc; + HBARegisterForAdapterAddEventsFunc registeredfunc = NULL; HBA_STATUS status = HBA_STATUS_OK; HBA_STATUS failure = HBA_STATUS_OK; HBA_LIBRARY_INFO *lib_infop; @@ -1363,7 +1362,7 @@ HBA_RegisterForAdapterAddEvents ( if(cbp == NULL) { #ifndef WIN32 fprintf(stderr, - "HBA_RegisterForAdapterAddEvents: calloc failed for %d bytes\n", + "HBA_RegisterForAdapterAddEvents: calloc failed for %lu bytes\n", sizeof(HBA_ALLADAPTERSCALLBACK_ELEM)); #endif return HBA_STATUS_ERROR; @@ -1403,7 +1402,7 @@ HBA_RegisterForAdapterAddEvents ( #ifndef WIN32 fprintf(stderr, "HBA_RegisterForAdapterAddEvents: " - "calloc failed for %d bytes\n", + "calloc failed for %lu bytes\n", sizeof(HBA_VENDORCALLBACK_ELEM)); #endif freevendorhandlelist(vendorhandlelist); @@ -1539,7 +1538,7 @@ HBA_RegisterForAdapterEvents ( if(acbp == NULL) { #ifndef WIN32 fprintf(stderr, - "HBA_RegisterForAdapterEvents: calloc failed for %d bytes\n", + "HBA_RegisterForAdapterEvents: calloc failed for %lu bytes\n", sizeof(HBA_ADAPTERCALLBACK_ELEM)); #endif RELEASE_MUTEX_RETURN(&_hbaapi_LL_mutex, HBA_STATUS_ERROR); @@ -1631,7 +1630,7 @@ HBA_RegisterForAdapterPortEvents ( #ifndef WIN32 fprintf(stderr, "HBA_RegisterForAdapterPortEvents: " - "calloc failed for %d bytes\n", + "calloc failed for %lu bytes\n", sizeof(HBA_ADAPTERCALLBACK_ELEM)); #endif RELEASE_MUTEX_RETURN(&_hbaapi_LL_mutex, HBA_STATUS_ERROR); @@ -1724,7 +1723,7 @@ HBA_RegisterForAdapterPortStatEvents ( #ifndef WIN32 fprintf(stderr, "HBA_RegisterForAdapterPortStatEvents: " - "calloc failed for %d bytes\n", + "calloc failed for %lu bytes\n", sizeof(HBA_ADAPTERCALLBACK_ELEM)); #endif RELEASE_MUTEX_RETURN(&_hbaapi_LL_mutex, HBA_STATUS_ERROR); @@ -1821,7 +1820,7 @@ HBA_RegisterForTargetEvents ( if(acbp == NULL) { #ifndef WIN32 fprintf(stderr, - "HBA_RegisterForTargetEvents: calloc failed for %d bytes\n", + "HBA_RegisterForTargetEvents: calloc failed for %lu bytes\n", sizeof(HBA_ADAPTERCALLBACK_ELEM)); #endif RELEASE_MUTEX_RETURN(&_hbaapi_LL_mutex, HBA_STATUS_ERROR); @@ -1916,7 +1915,7 @@ HBA_RegisterForLinkEvents ( if(acbp == NULL) { #ifndef WIN32 fprintf(stderr, - "HBA_RegisterForLinkEvents: calloc failed for %d bytes\n", + "HBA_RegisterForLinkEvents: calloc failed for %lu bytes\n", sizeof(HBA_ADAPTERCALLBACK_ELEM)); #endif RELEASE_MUTEX_RETURN(&_hbaapi_LL_mutex, HBA_STATUS_ERROR);
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor