Skip to content

Commit

Permalink
Merge pull request #35 from fkovinAtRocket/bugfix/warnings
Browse files Browse the repository at this point in the history
[experimental] Fix a number of warnings
  • Loading branch information
1000TurquoisePogs authored Aug 23, 2019
2 parents f7c6734 + 1913f0b commit 927a1b4
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 4 deletions.
1 change: 1 addition & 0 deletions c/authService.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#include <stdio.h>
#include <string.h>
#include <strings.h>
#include <stdlib.h>
#include <stdarg.h>
#include <sys/stat.h>
Expand Down
1 change: 1 addition & 0 deletions c/datasetService.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <strings.h>
#endif

Expand Down
1 change: 1 addition & 0 deletions c/serviceUtils.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <strings.h>
#include <stdarg.h>
#include <pthread.h>
#include <string.h>
#endif

#include "zowetypes.h"
Expand Down
1 change: 1 addition & 0 deletions c/unixFileService.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <stdio.h>
#include <string.h>
#include <time.h>
#include <stdlib.h>
#include "pthread.h"

#include "zowetypes.h"
Expand Down
11 changes: 7 additions & 4 deletions c/zss.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@

#include "zssLogging.h"
#include "serviceUtils.h"
#include "unixFileService.h"
#include "omvsService.h"
#include "datasetService.h"

#define PRODUCT "ZLUX"
#ifndef PRODUCT_MAJOR_VERSION
Expand All @@ -93,7 +96,7 @@ static void dumpJson(Json *json);
static JsonObject *readPluginDefinition(ShortLivedHeap *slh, char *pluginIdentifier, char *pluginLocation);
static WebPluginListElt* readWebPluginDefinitions(HttpServer* server, ShortLivedHeap *slh, char *dirname);
static JsonObject *readServerSettings(ShortLivedHeap *slh, const char *filename);
static InternalAPIMap *makeInternalAPIMap();
static InternalAPIMap *makeInternalAPIMap(void);

static int servePluginDefinitions(HttpService *service, HttpResponse *response){
zowelog(NULL, LOG_COMP_ID_MVD_SERVER, ZOWE_LOG_DEBUG2, "begin %s\n", __FUNCTION__);
Expand Down Expand Up @@ -409,7 +412,7 @@ static MapItem mapItems[] ={
{0,0}
};

static InternalAPIMap *makeInternalAPIMap() {
static InternalAPIMap *makeInternalAPIMap(void) {
/* allocate a single chunk for the struct and all the pointers. */
const int entryCount = ((sizeof mapItems)/(sizeof(mapItems[0])))-1;
const int pointerArraySize = entryCount*(sizeof (void*));
Expand Down Expand Up @@ -660,13 +663,13 @@ void checkAndSetVariable(JsonObject *mvdSettings,
}
}

static void initLoggingComponents() {
static void initLoggingComponents(void) {
logConfigureComponent(NULL, LOG_COMP_ID_MVD_SERVER, "ZSS server", LOG_DEST_PRINTF_STDOUT, ZOWE_LOG_INFO);
logConfigureComponent(NULL, LOG_COMP_ID_CTDS, "CT/DS", LOG_DEST_PRINTF_STDOUT, ZOWE_LOG_INFO);
zowelog(NULL, LOG_COMP_ID_MVD_SERVER, ZOWE_LOG_INFO, "zssServer startup, version %s\n", productVersion);
}

static void initVersionComponents(){
static void initVersionComponents(void){
sprintf(productVersion,"%d.%d.%d+%d",PRODUCT_MAJOR_VERSION,PRODUCT_MINOR_VERSION,PRODUCT_REVISION,PRODUCT_VERSION_DATE_STAMP);
}

Expand Down

0 comments on commit 927a1b4

Please sign in to comment.