ckp

libdispatch/drc.c

@@ -137,15 +137,13 @@ This is set by the environment variable NC_TEST_AWS_DIR.
 void
 ncrc_initialize(void)
 {
-    int stat = NC_NOERR;
-    NCglobalstate* ncg = NULL;
-
     if(NCRCinitialized) return;
     NCRCinitialized = 1; /* prevent recursion */
 
-    ncg = NC_getglobalstate();
-
 #ifndef NOREAD
+    {
+    int stat = NC_NOERR;
+    NCglobalstate* ncg = NC_getglobalstate();
     /* Load entrys */
     if((stat = NC_rcload())) {
         nclog(NCLOGWARN,".rc loading failed");
@@ -154,6 +152,7 @@ ncrc_initialize(void)
     if((stat = NC_aws_load_credentials(ncg))) {
         nclog(NCLOGWARN,"AWS config file not loaded");
     }
+    }
 #endif
 }
 
@@ -329,7 +328,7 @@ NC_set_rcfile(const char* rcfile)
         goto done;
     }
     fclose(f);
-    nullfree(globalstate->rcinfo->rcfile);
+    NC_rcclear(globalstate->rcinfo);
     globalstate->rcinfo->rcfile = strdup(rcfile);
     /* Clear globalstate->rcinfo */
     NC_rcclear(&globalstate->rcinfo);