# HG changeset patch # User Sascha Wilde # Date 1396617069 -7200 # Node ID 46fd116996464813695b82bd807a14452e437ad5 # Parent 43416dcbcc50bac0dabca05681f0c9e759b86cc5 Renamed exit code from return_code to exit_code. diff -r 43416dcbcc50 -r 46fd11699646 cinst/mozilla.c --- a/cinst/mozilla.c Fri Apr 04 13:34:30 2014 +0200 +++ b/cinst/mozilla.c Fri Apr 04 15:11:09 2014 +0200 @@ -92,7 +92,7 @@ * errors. In case of mor than one warning the warning codes will be * ORed together. */ -int return_code = 0; +int exit_code = 0; /** * @brief Return configuration base directory. @@ -194,7 +194,7 @@ else { DEBUGPRINTF("WARN! Non existent profile path: '%s'\n", path); - return_code |= WARN_MOZ_PROFILE_DOES_NOT_EXIST; + exit_code |= WARN_MOZ_PROFILE_DOES_NOT_EXIST; } } else if (str_equal(key, "IsRelative") && @@ -207,7 +207,7 @@ else { DEBUGPRINTF("WARN! Could not open ini file: '%s'\n", inifile_name); - return_code |= WARN_MOZ_FAILED_TO_OPEN_INI; + exit_code |= WARN_MOZ_FAILED_TO_OPEN_INI; } return dirs; } @@ -630,13 +630,13 @@ { DEBUGPRINTF("FATAL: Could not open %s for reading!\n", argv[1]); - return_code = ERR_MOZ_FAILED_TO_OPEN_INPUT; + exit_code = ERR_MOZ_FAILED_TO_OPEN_INPUT; goto exit; } break; default: DEBUGPRINTF("FATAL: Wrong number of arguments!\n"); - return_code = ERR_MOZ_WRONG_ARGC; + exit_code = ERR_MOZ_WRONG_ARGC; goto exit; } @@ -654,10 +654,10 @@ #endif if (! apply_to_certs_and_profiles(remove_cert, &certs_to_remove, dbdirs)) - return_code |= WARN_MOZ_COULD_NOT_REMOVE_CERT; + exit_code |= WARN_MOZ_COULD_NOT_REMOVE_CERT; if (! apply_to_certs_and_profiles(import_cert, &certs_to_add, dbdirs)) - return_code |= WARN_MOZ_COULD_NOT_ADD_CERT; + exit_code |= WARN_MOZ_COULD_NOT_ADD_CERT; #ifdef DEBUGOUTPUT DEBUGPRINTF("NEW List of installed certs:\n"); @@ -671,5 +671,5 @@ fclose(input_stream); exit: - exit(return_code); + exit(exit_code); }