From 246615f2381eb75aeebcd7a66d1ec9635bcedb32 Mon Sep 17 00:00:00 2001 From: sterlingpickens Date: Mon, 26 May 2014 19:53:27 -0700 Subject: [PATCH 1/2] initial_args warning Provide for WIN32 and non-WIN32 condition for initial_args malloc (compiler warning) and remove redundant static. --- sgminer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sgminer.c b/sgminer.c index 185f0e0e..35299b86 100644 --- a/sgminer.c +++ b/sgminer.c @@ -3243,7 +3243,6 @@ void kill_work(void) quit(0, "Shutdown signal received."); } -static #ifdef WIN32 const #endif @@ -7941,7 +7940,12 @@ int main(int argc, char *argv[]) quithere(1, "Failed to pthread_mutex_init lockstat_lock errno=%d", errno); #endif +#ifdef WIN32 initial_args = (const char **)malloc(sizeof(char *)* (argc + 1)); +#else + initial_args = (char **)malloc(sizeof(char *)* (argc + 1)); +#endif + for (i = 0; i < argc; i++) initial_args[i] = strdup(argv[i]); initial_args[argc] = NULL; From 812efe4abc7865f0ae49f27294d3f7c20de5308f Mon Sep 17 00:00:00 2001 From: sterlingpickens Date: Mon, 26 May 2014 23:26:27 -0700 Subject: [PATCH 2/2] initial_args warning Remove #ifdef WIN32 "static const char *" appears to be ok for all platforms. --- sgminer.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sgminer.c b/sgminer.c index 35299b86..e615fd23 100644 --- a/sgminer.c +++ b/sgminer.c @@ -3243,10 +3243,7 @@ void kill_work(void) quit(0, "Shutdown signal received."); } -#ifdef WIN32 -const -#endif -char **initial_args; +static const char **initial_args; static void clean_up(bool restarting); @@ -7940,12 +7937,7 @@ int main(int argc, char *argv[]) quithere(1, "Failed to pthread_mutex_init lockstat_lock errno=%d", errno); #endif -#ifdef WIN32 initial_args = (const char **)malloc(sizeof(char *)* (argc + 1)); -#else - initial_args = (char **)malloc(sizeof(char *)* (argc + 1)); -#endif - for (i = 0; i < argc; i++) initial_args[i] = strdup(argv[i]); initial_args[argc] = NULL;