ICU 56 update step 1

source/common/icuplug.cpp

 /*
 ******************************************************************************
 *
 *   Copyright (C) 2009-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *
 *  FILE NAME : icuplug.c
 *
 *   Date         Name        Description
 *   10/29/2009   sl          New.
 ******************************************************************************
 */
 
 #include "unicode/icuplug.h"
+
+
+#if UCONFIG_ENABLE_PLUGINS
+
+
 #include "icuplugimp.h"
 #include "cstring.h"
 #include "cmemory.h"
 #include "putilimp.h"
 #include "ucln.h"
 #include <stdio.h>
 #ifdef __MVS__  /* defined by z/OS compiler */
 #define _POSIX_SOURCE
 #include <cics.h> /* 12 Nov 2011 JAM iscics() function */
 #endif
@@ skipping 273 matching lines @@
       plug->awaitingLoad = FALSE;
     }
   } else {
     plug->pluginStatus = U_INTERNAL_PROGRAM_ERROR;
     plug->awaitingLoad = FALSE;
   }
 }
 
 
 static void uplug_loadPlug(UPlugData *plug, UErrorCode *status) {
+  if(U_FAILURE(*status)) {
+    return;
+  }
   if(!plug->awaitingLoad || (plug->level < UPLUG_LEVEL_LOW) ) {  /* shouldn't happen. Plugin hasn'tbeen loaded yet.*/
     *status = U_INTERNAL_PROGRAM_ERROR;
     return;
   }
   uplug_callPlug(plug, UPLUG_REASON_LOAD, status);
   plug->awaitingLoad = FALSE;
   if(!U_SUCCESS(*status)) {
     plug->pluginStatus = U_INTERNAL_PROGRAM_ERROR;
   }
 }
@@ skipping 25 matching lines @@
   plug->sym[0]=0;
   plug->lib=NULL;
   plug->entrypoint=NULL;
 
 
   return plug;
 }
 
 static UPlugData *uplug_allocatePlug(UPlugEntrypoint *entrypoint, const char *config, void *lib, const char *symName,
                                      UErrorCode *status) {
-  UPlugData *plug;
-
+  UPlugData *plug = uplug_allocateEmptyPlug(status);
   if(U_FAILURE(*status)) {
     return NULL;
   }
 
-  plug = uplug_allocateEmptyPlug(status);
   if(config!=NULL) {
     uprv_strncpy(plug->config, config, UPLUG_NAME_MAX);
   } else {
     plug->config[0] = 0;
   }
     
   if(symName!=NULL) {
     uprv_strncpy(plug->sym, symName, UPLUG_NAME_MAX);
   } else {
     plug->sym[0] = 0;
@@ skipping 491 matching lines @@
 #if UPLUG_TRACE
       DBG((stderr, "Can't open plugin file %s\n", plugin_file));
 #endif
     }
   }
   uplug_loadWaitingPlugs(status);
 #endif /* U_ENABLE_DYLOAD */
   gCurrentLevel = UPLUG_LEVEL_HIGH;
   ucln_registerCleanup(UCLN_UPLUG, uplug_cleanup);
 }
+
+#endif
+
+