The package rpms/gridengine.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/gridengine.git/commit/?id=ad93a7773a....
Change: -ExcludeArch: ppc64
Thanks.
Full change: ============
commit ad93a7773a452afbb316cd7857339d5898bd0052 Author: Orion Poplawski orion@nwra.com Date: Fri Aug 18 14:11:10 2017 -0600
Mostly dead upstream and does not build with openssl 1.1
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ca401cf..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -ge-V62u5_TAG-src.tar.bz2 -gridengine-ppc.tar.gz -/SGE6.2u5p2.tar.gz -/GE2011.11.tar.gz -/GE2011.11p1.tar.gz diff --git a/Licenses b/Licenses deleted file mode 100644 index 2e7fbc5..0000000 --- a/Licenses +++ /dev/null @@ -1,34 +0,0 @@ -Whole license: SISSL - -source/3rdparty/adoc/ GPL+ -> unused -source/3rdparty/fnmatch/ BSD with advertising -> unused -source/3rdparty/openssl/ OpenSSL -> unused -source/3rdparty/qidl/ copyright only -> unused - -source/3rdparty/qmake/ GPL+ -> Installed as qmake -source/3rdparty/qmake/alloca.c Public Domain? -> unused -source/3rdparty/qmake/amiga.c GPLv2+ -> Installed as qmake -(and others) - ! Note - qmake is not linked or used by other parts - of gridengine - -source/3rdparty/qmon/Xbae/ MIT -source/3rdparty/qmon/Xmt310/ BSD -source/3rdparty/qmon/iconlist/ MIT -source/3rdparty/qmon/ltree/ LGPL+ -source/3rdparty/qmon/spinbox/ MIT -source/3rdparty/qmon/tab/ MIT - -source/3rdparty/qtcsh/ BSD with advertising -> Installed as qtcsh -source/3rdparty/qtcsh/ma.setp.c MIT -> unused - ! Note - qtcsh is not linked or used by other parts - of gridengine - -source/3rdparty/sge_depend/ MIT -source/3rdparty/snprintf/ the Frontier Artistic License -> unused -source/3rdparty/strptime/ BSD with advertising -> unused - -source/scripts/ldAix MIT -> unused - diff --git a/README b/README deleted file mode 100644 index 0c1f854..0000000 --- a/README +++ /dev/null @@ -1,43 +0,0 @@ -Setting up a gridengine install using these RPMs is a little different than -using the standard Sun courtesy binaries. The default configuration setup is geared -for a "reduced NFS" install with logs going into the /var/spool/gridengine -directories on each host. - -You probably want to edit /etc/hosts to remove any mentions of the hostname -on the localhost line, like the following: - -127.0.0.1 localhost.localdomain localhost hostname - -- On the qmaster (and any shadow hosts) install gridengine-qmaster, then: - - 1) - cd /usr/share/gridengine - 2) - ./install_qmaster [any desired options] - -OR - - edit my_configuration.conf to make any needed changes and run: - - ./install_qmaster -auto ./my_configuration.conf - - 3) Make sure the files act_qmaster, bootstrap, and settings.*sh from the - directory /usr/share/gridengine/default/common/ are shared to all clients. - If you don't run with a shadow master configuration you can simply copy - these files to the other machines. - -If you change the default SGE_ROOT or SGE_CELL values, you will need to -edit /etc/sysconfig/gridengine and change them there as well for the startup -scripts to work. - -- On execution hosts install gridengine-execd, then: - - cd /usr/share/gridengine - ./install_execd - -OR if you have a default install, you may be able to just do: - - systemctl enable sge_execd - systemctl start sge_execd - -- On submit hosts install gridengine diff --git a/README.mingw b/README.mingw deleted file mode 100644 index 1894062..0000000 --- a/README.mingw +++ /dev/null @@ -1,8 +0,0 @@ -I took a look at compiling gridengine with mingw. Current stumbling block is -that mingw32-w32api does not have pdh.h/libpdh.a (pdh.dll) from the Windows SDK. - -Filed: https://sourceforge.net/tracker/?func=detail&aid=3509880&group_id=24... - -The patch gridengine-mingw.patch adds a -mingw32 flag for aimk to use for the -compile step after dependencies have been generated. (Strange, but you need -native tools to generate the deps) diff --git a/conf_defaults b/conf_defaults deleted file mode 100644 index b0f48f7..0000000 --- a/conf_defaults +++ /dev/null @@ -1,16 +0,0 @@ -SGE_ROOT="/usr/share/gridengine" -SGE_QMASTER_PORT=6444 -SGE_EXECD_PORT=6445 -SGE_CLUSTER_NAME="p6444" -SGE_JVM_LIB_PATH="none" -QMASTER_SPOOL_DIR="/var/spool/gridengine/default/qmaster" -EXECD_SPOOL_DIR="/var/spool/gridengine" -GID_RANGE="16000-16100" -DB_SPOOLING_DIR="/var/spool/gridengine/default/spooldb" -ADMIN_HOST_LIST="" -SUBMIT_HOST_LIST="" -EXEC_HOST_LIST="" -EXECD_SPOOL_DIR_LOCAL="/var/spool/gridengine" -SET_FILE_PERMS="false" -SHADOW_HOST="" -EXEC_HOST_LIST_RM="" diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..717a078 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Mostly dead upstream and does not build with openssl 1.1 diff --git a/gridengine-6.2-jni.patch b/gridengine-6.2-jni.patch deleted file mode 100644 index d4bec03..0000000 --- a/gridengine-6.2-jni.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- gridengine/source/daemons/qmaster/sge_thread_jvm.c.jni 2008-07-10 10:05:22.000000000 -0600 -+++ gridengine/source/daemons/qmaster/sge_thread_jvm.c 2008-11-04 15:14:53.000000000 -0700 -@@ -766,11 +766,17 @@ - jvm_argv[2] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.grid.jgdi.caTop=%s", ctx->get_ca_root(ctx))); - jvm_argv[3] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.grid.jgdi.serverKeystore=%s", keystore_path)); - jvm_argv[4] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.grid.jgdi.sgeQmasterSpoolDir=%s", ctx->get_qmaster_spool_dir(ctx))); -- jvm_argv[5] = strdup(sge_dstring_sprintf(&ds, "-Djava.class.path=%s/lib/jgdi.jar:%s/lib/juti.jar", ctx->get_sge_root(ctx), ctx->get_sge_root(ctx))); -+ char *libdir; -+ if (strstr(sge_get_arch(),"64") != NULL) { -+ libdir = "lib64"; -+ } else { -+ libdir = "lib"; -+ } -+ jvm_argv[5] = strdup(sge_dstring_sprintf(&ds, "-Djava.class.path=/usr/%s/gridengine/jgdi.jar:/usr/%s/gridengine/juti.jar", libdir, libdir)); - jvm_argv[6] = strdup(sge_dstring_sprintf(&ds, "-Djava.security.policy=%s/common/jmx/java.policy", ctx->get_cell_root(ctx))); - jvm_argv[7] = strdup("-Djava.security.manager=com.sun.grid.jgdi.management.JGDISecurityManager"); -- jvm_argv[8] = strdup(sge_dstring_sprintf(&ds, "-Djava.rmi.server.codebase=file://%s/lib/jgdi.jar file://%s/lib/juti.jar", ctx->get_sge_root(ctx), ctx->get_sge_root(ctx))); -- jvm_argv[9] = strdup(sge_dstring_sprintf(&ds, "-Djava.library.path=%s/lib/%s", ctx->get_sge_root(ctx), sge_get_arch())); -+ jvm_argv[8] = strdup(sge_dstring_sprintf(&ds, "-Djava.rmi.server.codebase=file:///usr/%s/gridengine/jgdi.jar file:///usr/%s/gridengine/juti.jar", libdir, libdir)); -+ jvm_argv[9] = strdup(sge_dstring_sprintf(&ds, "-Djava.library.path=/usr/%s/gridengine", libdir)); - jvm_argv[10] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.management.jmxremote.access.file=%s/common/jmx/jmxremote.access", ctx->get_cell_root(ctx))); - jvm_argv[11] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.management.jmxremote.password.file=%s/common/jmx/jmxremote.password", ctx->get_cell_root(ctx))); - jvm_argv[12] = strdup(sge_dstring_sprintf(&ds, "-Djava.security.auth.login.config=%s/common/jmx/jaas.config", ctx->get_cell_root(ctx))); ---- gridengine/source/libs/jgdi/util/java.policy.template.jni 2008-02-13 07:35:11.000000000 -0700 -+++ gridengine/source/libs/jgdi/util/java.policy.template 2008-11-06 09:32:31.000000000 -0700 -@@ -39,7 +39,7 @@ - ** grant principal javax.management.remote.JMXPrincipal "controlRole" - ** - */ --grant codeBase "file:${com.sun.grid.jgdi.sgeRoot}/lib/jgdi.jar" { -+grant codeBase "file:${java.library.path}/jgdi.jar" { - permission java.net.SocketPermission "*:1024-", "accept,connect"; - permission java.net.SocketPermission "localhost:1024-", "listen,resolve"; - permission java.lang.RuntimePermission "loadLibrary.jgdi"; diff --git a/gridengine-6.2u2_1-izpack.patch b/gridengine-6.2u2_1-izpack.patch deleted file mode 100644 index 8f00601..0000000 --- a/gridengine-6.2u2_1-izpack.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- gridengine/source/clients/gui-installer/build.xml.izpack 2009-02-16 04:15:38.000000000 -0700 -+++ gridengine/source/clients/gui-installer/build.xml 2009-03-25 14:05:54.000000000 -0600 -@@ -66,20 +66,20 @@ - <echo message="Check IzPack"/> - <!-- Check IzPack is build, if not build it --> - <condition property="izpack.isbuild"> -- <available file="${izpack.home}/_build"/> -+ <available file="${izpack.lib}/standalone-compiler.jar"/> - </condition> - <antcall target="build.izpack"/> - <!-- Check that IzPack was build and we have it on the classpath --> - <condition property="izpack.complete"> - <available classpath="${javac.classpath}" classname="com.izforge.izpack.installer.IzPanel"/> - </condition> -- <fail unless="izpack.complete" message="You need to install IzPack 4.1.1 and set the izpack.home property in the gridengine/source/build_private.properties first!"/> -+ <fail unless="izpack.complete" message="You need to install IzPack 4.1.1 and set the izpack.lib property in the gridengine/source/build_private.properties first!"/> - - <!-- Let's copy the stuff we need locally to our build.dir, so each user works with his own files --> - <property name="build.panels.dir" value="bin/panels"/> - <property name="compiler.path" value="${build.dir}/standalone-compiler.jar"/> - <mkdir dir="${build.panels.dir}"/> -- <copyfile src="${izpack.home}/lib/standalone-compiler.jar" dest="${compiler.path}"/> -+ <copyfile src="${izpack.lib}/standalone-compiler.jar" dest="${compiler.path}"/> - - <echo message="Building prerequsities from source/3rdparty/IzPack/src ..."/> - <javac srcdir="../../3rdparty/IzPack/src" diff --git a/gridengine-6.2u2_1-sge_ca.patch b/gridengine-6.2u2_1-sge_ca.patch deleted file mode 100644 index 97c5bd7..0000000 --- a/gridengine-6.2u2_1-sge_ca.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- gridengine/source/dist/util/sgeCA/sge_ca.sge_ca 2008-12-08 13:38:02.000000000 -0700 -+++ gridengine/source/dist/util/sgeCA/sge_ca 2009-03-19 16:11:13.000000000 -0600 -@@ -928,7 +928,10 @@ - return 1 - fi - -- JVM_ARGS="-cp $ROOT_PATH/lib/juti.jar" -+ case "$ARCH" in -+ *64) JVM_ARGS="-cp /usr/lib64/gridengine/juti.jar";; -+ *) JVM_ARGS="-cp /usr/lib/gridengine/juti.jar";; -+ esac - JVM_ARGS="$JVM_ARGS -Djava.util.logging.config.file=$ROOT_PATH/util/sgeCA/logging.properties" - - OUTPUT=`$JAVA $JVM_ARGS com.sun.grid.ca.Main $CA_ARGS 2>&1` -@@ -1722,22 +1725,6 @@ - exit 1 - fi - --if [ ! -d "$ROOT_PATH/lib/$ARCH" ]; then -- echo -- echo "Error: The lib directory "$ROOT_PATH/lib/$ARCH" does not exist" -- echo "Please verify your setup and restart this script. Exit." -- exit 1 --fi -- --shlib_path_name=`$ROOT_PATH/util/arch -lib` --old_shlib_path_name=`eval echo '$'$shlib_path_name` --if [ x$old_shlib_path_name = x ]; then -- eval $shlib_path_name=$ROOT_PATH/lib/$ARCH --else -- eval $shlib_path_name="$ROOT_PATH/lib/${ARCH}:${old_shlib_path_name}" --fi --export $shlib_path_name -- - #--------------------------------------- - # setup INFOTEXT begin - #--------------------------------------- -@@ -1776,7 +1763,7 @@ - # - # Check wether all needed binaries are exists - # --for i in adminrun openssl uidgid; do -+for i in adminrun uidgid; do - if [ ! -x $V5UTILBIN/$i ]; then - PrintErrorAndExit 1 "Error: Can't find binary "%s"" $V5UTILBIN/$i - fi -@@ -1805,7 +1792,7 @@ - - CAKEY=cakey.pem - CACERT=cacert.pem --OPENSSL=$V5UTILBIN/openssl -+OPENSSL=/usr/bin/openssl - - AUTO="false" - #----------------------------- diff --git a/gridengine-6.2u5-gethostname.patch b/gridengine-6.2u5-gethostname.patch deleted file mode 100644 index aee2dca..0000000 --- a/gridengine-6.2u5-gethostname.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- gridengine/source/dist/util/install_modules/inst_common.sh.gethostname 2010-08-26 07:57:41.000000000 +1200 -+++ gridengine/source/dist/util/install_modules/inst_common.sh 2010-11-23 10:24:51.932798405 +1300 -@@ -1569,18 +1569,37 @@ - #------------------------------------------------------------------------- - # CheckForLocalHostResolving - # "localhost", localhost.localdomain and 127.0.x.x are not supported -+# if there are no other names or no other ip addresses - # - # - CheckForLocalHostResolving() - { -- output=`$SGE_UTILBIN/gethostname| cut -f2 -d:` -+ output=`$SGE_UTILBIN/gethostname| grep "^Host" | cut -f2 -d:` -+ -+ notok=true -+ hostok=false -+ ipok=false - -- notok=false - for cmp in $output; do - case "$cmp" in -- localhost*|127.0*) -- notok=true -+ (localhost*|127.0*) - ;; -+ (*) -+ isIp=`IsIpAddress $cmp ` -+ if [ $? -eq 1 ]; then -+ if [ $hostok = true ]; then -+ notok=false -+ break -+ fi -+ ipok=true -+ else -+ if [ $ipok = true ]; then -+ notok=false -+ break -+ fi -+ hostok=true -+ fi -+ ;; - esac - done - diff --git a/gridengine-add-aarch64.patch b/gridengine-add-aarch64.patch deleted file mode 100644 index 4674ec8..0000000 --- a/gridengine-add-aarch64.patch +++ /dev/null @@ -1,29 +0,0 @@ -armv8* is 32bit on 64bit hardware - -Index: GE2011.11p1/source/dist/util/arch -=================================================================== ---- GE2011.11p1.orig/source/dist/util/arch -+++ GE2011.11p1/source/dist/util/arch -@@ -229,7 +229,7 @@ Linux) - s390x) - lxmachine=s390x - ;; -- armv8*) -+ aarch64*) - lxmachine=arm64 - ;; - arm*) -Index: GE2011.11p1/source/aimk -=================================================================== ---- GE2011.11p1.orig/source/aimk -+++ GE2011.11p1/source/aimk -@@ -2325,6 +2325,9 @@ if ( $JNI == 1 ) then - set JAVA_LIB_ARCH = amd64 - endif - breaksw -+ case linux-arm64: -+ set JAVA_LIB_ARCH = aarch64 -+ breaksw - case linux-arm: - set JAVA_LIB_ARCH = arm - breaksw diff --git a/gridengine-arm.patch b/gridengine-arm.patch deleted file mode 100644 index a092a84..0000000 --- a/gridengine-arm.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up GE2011.11/source/aimk.arm GE2011.11/source/aimk ---- GE2011.11/source/aimk.arm 2012-04-17 10:30:18.892872672 -0600 -+++ GE2011.11/source/aimk 2012-07-06 11:21:41.691920730 -0600 -@@ -2325,6 +2325,9 @@ if ( $JNI == 1 ) then - set JAVA_LIB_ARCH = amd64 - endif - breaksw -+ case linux-arm: -+ set JAVA_LIB_ARCH = arm -+ breaksw - case linux-ia64: - set JAVA_LIB_ARCH = ia64 - breaksw diff --git a/gridengine-format.patch b/gridengine-format.patch deleted file mode 100644 index 6eb807a..0000000 --- a/gridengine-format.patch +++ /dev/null @@ -1,4339 +0,0 @@ -diff -up GE2011.11p1/source/3rdparty/qmake/remote-stub.c.format GE2011.11p1/source/3rdparty/qmake/remote-stub.c ---- GE2011.11p1/source/3rdparty/qmake/remote-stub.c.format 2012-05-23 13:04:55.000000000 -0600 -+++ GE2011.11p1/source/3rdparty/qmake/remote-stub.c 2014-10-03 21:18:11.271530498 -0600 -@@ -342,7 +342,7 @@ static void remote_exit(int code, const - } - - if(message) { -- fprintf(stderr, message); -+ fprintf(stderr, "%s", message); - } - - if(reason) { -diff -up GE2011.11p1/source/clients/common/read_defaults.c.format GE2011.11p1/source/clients/common/read_defaults.c ---- GE2011.11p1/source/clients/common/read_defaults.c.format 2012-05-23 13:04:45.000000000 -0600 -+++ GE2011.11p1/source/clients/common/read_defaults.c 2014-10-03 21:11:16.286851285 -0600 -@@ -223,7 +223,7 @@ static char *get_cwd_defaults_file_path( - DENTER (TOP_LAYER, "get_cwd_defaults_file_name"); - - if (!getcwd(cwd, sizeof(cwd))) { -- sprintf(str, MSG_FILE_CANTREADCURRENTWORKINGDIR); -+ sprintf(str, "%s", MSG_FILE_CANTREADCURRENTWORKINGDIR); - answer_list_add(answer_list, str, STATUS_EDISK, ANSWER_QUALITY_ERROR); - } - -diff -up GE2011.11p1/source/clients/common/sge_cqueue_qconf.c.format GE2011.11p1/source/clients/common/sge_cqueue_qconf.c ---- GE2011.11p1/source/clients/common/sge_cqueue_qconf.c.format 2012-05-23 13:04:45.000000000 -0600 -+++ GE2011.11p1/source/clients/common/sge_cqueue_qconf.c 2014-10-03 21:11:16.286851285 -0600 -@@ -788,7 +788,7 @@ cqueue_list_sick(sge_gdi_ctx_class_t *ct - } - - if (sge_dstring_get_string(&ds)) { -- printf(sge_dstring_get_string(&ds)); -+ printf("%s", sge_dstring_get_string(&ds)); - ret = false; - } - -diff -up GE2011.11p1/source/clients/qacct/qacct.c.format GE2011.11p1/source/clients/qacct/qacct.c ---- GE2011.11p1/source/clients/qacct/qacct.c.format 2012-05-23 13:04:46.000000000 -0600 -+++ GE2011.11p1/source/clients/qacct/qacct.c 2014-10-03 21:11:16.287851309 -0600 -@@ -460,7 +460,7 @@ int main(int argc, char **argv) - options.arflag = 1; - } else { - if (sscanf(argv[++ii], sge_u32, &options.ar_number) != 1) { -- fprintf(stderr, MSG_PARSE_INVALID_AR_MUSTBEUINT); -+ fprintf(stderr, "%s", MSG_PARSE_INVALID_AR_MUSTBEUINT); - fprintf(stderr, "\n"); - qacct_usage(&ctx, stderr); - DRETURN(1); -@@ -694,7 +694,7 @@ int main(int argc, char **argv) - QAJ_arid); - summary_view = true; - if (sorted_list == NULL || sort_order == NULL) { -- ERROR((SGE_EVENT, MSG_HISTORY_NOTENOUGTHMEMORYTOCREATELIST)); -+ ERROR((SGE_EVENT, "%s", MSG_HISTORY_NOTENOUGTHMEMORYTOCREATELIST)); - goto QACCT_EXIT; - } - } -@@ -891,7 +891,7 @@ int main(int argc, char **argv) - SGE_EXIT((void**)&ctx, 0); - } - } else if (options.taskstart && options.taskend && options.taskstep) { -- ERROR((SGE_EVENT, MSG_HISTORY_TOPTIONREQUIRESJOPTION )); -+ ERROR((SGE_EVENT, "%s", MSG_HISTORY_TOPTIONREQUIRESJOPTION )); - qacct_usage(&ctx, stderr); - free_qacct_lists(¢ry_list, &queue_list, &exechost_list, &hgrp_list); - SGE_EXIT((void**)&ctx, 0); -diff -up GE2011.11p1/source/clients/qconf/parse_qconf.c.format GE2011.11p1/source/clients/qconf/parse_qconf.c ---- GE2011.11p1/source/clients/qconf/parse_qconf.c.format 2012-05-23 13:04:46.000000000 -0600 -+++ GE2011.11p1/source/clients/qconf/parse_qconf.c 2014-10-03 21:11:16.288851332 -0600 -@@ -3082,7 +3082,7 @@ int sge_parse_qconf(sge_gdi_ctx_class_t - /* parse command line arguments */ - attr = sge_strdup(NULL, *spp); - if (attr == NULL) { -- ERROR((SGE_EVENT, MSG_QCONF_NOATTRIBUTEGIVEN)); -+ ERROR((SGE_EVENT, "%s", MSG_QCONF_NOATTRIBUTEGIVEN)); - DRETURN(1); - } - spp = sge_parser_get_next(ctx, spp); -@@ -3327,7 +3327,7 @@ int sge_parse_qconf(sge_gdi_ctx_class_t - } - - if (ep == NULL) { -- fprintf(stderr, errstr); -+ fprintf(stderr, "%s", errstr); - if (sge_error_and_exit(ctx, MSG_FILE_ERRORREADINGINFILE)) - continue; - } -@@ -4174,7 +4174,7 @@ int sge_parse_qconf(sge_gdi_ctx_class_t - lFreeElem(&hep); - } - else { -- fprintf(stderr, MSG_ANSWER_NEEDHOSTNAMETODELLOCALCONFIG); -+ fprintf(stderr, "%s", MSG_ANSWER_NEEDHOSTNAMETODELLOCALCONFIG); - fprintf(stderr, "\n"); - sge_parse_return = 1; - } -@@ -6324,7 +6324,7 @@ static int show_eventclients(sge_gdi_ctx - } - } - else { -- fprintf(stderr, MSG_QCONF_NOEVENTCLIENTSREGISTERED); -+ fprintf(stderr, "%s", MSG_QCONF_NOEVENTCLIENTSREGISTERED); - fprintf(stderr, "\n"); - } - lFreeList(&alp); -@@ -6432,7 +6432,7 @@ static int show_processors(sge_gdi_ctx_c - printf("\n"); - } - else { -- fprintf(stderr, MSG_QCONF_NOEXECUTIONHOSTSDEFINED ); -+ fprintf(stderr, "%s", MSG_QCONF_NOEXECUTIONHOSTSDEFINED ); - fprintf(stderr, "\n"); - } - -@@ -7093,7 +7093,7 @@ static int qconf_modify_attribute(sge_gd - DRETURN(1); - } - if (*epp == NULL){ -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_FILE_ERRORREADINGINFILE)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_FILE_ERRORREADINGINFILE)); - answer_list_add(alpp, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - DRETURN(1); - } -@@ -7231,7 +7231,7 @@ static int qconf_modify_attribute(sge_gd - lList *lp = lGetList(*epp, fields[0]); - - if (lp == NULL || lGetNumberOfElem(lp) == 0) { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_QCONF_CANT_MODIFY_NONE)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_QCONF_CANT_MODIFY_NONE)); - answer_list_add(alpp, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - lFreeElem(epp); - lFreeWhat(&what); -@@ -7249,7 +7249,7 @@ static int qconf_modify_attribute(sge_gd - for (nm = ep->descr[0].nm; nm != NoName; nm = ep->descr[count++].nm) { - if (lGetType(ep->descr, nm) == lListT) { - if (lGetList(ep, nm) == NULL) { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_QCONF_CANT_MODIFY_NONE)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_QCONF_CANT_MODIFY_NONE)); - answer_list_add(alpp, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - lFreeElem(epp); - lFreeWhat(&what); -diff -up GE2011.11p1/source/clients/qmod/qmod.c.format GE2011.11p1/source/clients/qmod/qmod.c ---- GE2011.11p1/source/clients/qmod/qmod.c.format 2012-05-23 13:04:46.000000000 -0600 -+++ GE2011.11p1/source/clients/qmod/qmod.c 2014-10-03 21:11:16.289851355 -0600 -@@ -472,7 +472,7 @@ int usageshowed = 0; - } - - if(lGetNumberOfElem(*ppcmdline)) { -- sprintf(str, MSG_PARSE_TOOMANYOPTIONS); -+ sprintf(str, "%s", MSG_PARSE_TOOMANYOPTIONS); - if(!usageshowed) - qmod_usage(stderr, NULL); - answer_list_add(&alp, str, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR); -diff -up GE2011.11p1/source/clients/qmon/qmon_arsub.c.format GE2011.11p1/source/clients/qmon/qmon_arsub.c ---- GE2011.11p1/source/clients/qmon/qmon_arsub.c.format 2012-05-23 13:04:46.000000000 -0600 -+++ GE2011.11p1/source/clients/qmon/qmon_arsub.c 2014-10-03 21:11:16.289851355 -0600 -@@ -809,7 +809,7 @@ static void qmonARSubARSub(Widget w, XtP - pe = strtok(theInput, " "); - pe_range = strtok(NULL, "\n"); - if (!(pe_range && pe_range[0] != '\0')) { -- sprintf(buf, -+ sprintf(buf, "%s", - XmtLocalize(w, - "Parallel Environment requires valid name and valid range !", - "Parallel Environment requires valid name and valid range !") -@@ -822,7 +822,7 @@ static void qmonARSubARSub(Widget w, XtP - 1, 0, INF_ALLOWED); - lFreeList(&range_list); - if (alp) { -- sprintf(buf, -+ sprintf(buf, "%s", - XmtLocalize(w, - "Parallel Environment requires valid name and valid range !", - "Parallel Environment requires valid name and valid range !") -@@ -835,7 +835,7 @@ static void qmonARSubARSub(Widget w, XtP - - if (!(lp = lCreateElemList("ARSubList", AR_Type, 1))) { - DPRINTF(("lCreateElemList failure\n")); -- sprintf(buf, -+ sprintf(buf, "%s", - XmtLocalize(w, - "AR submission failed", - "AR submission failed") -@@ -845,7 +845,7 @@ static void qmonARSubARSub(Widget w, XtP - - if (!qmonARSMToCull(&ARSMData, lFirst(lp), 0)) { - DPRINTF(("qmonARSMToCull failure\n")); -- sprintf(buf, -+ sprintf(buf, "%s", - XmtLocalize(w, - "AR submission failed", - "AR submission failed") -@@ -885,7 +885,7 @@ static void qmonARSubARSub(Widget w, XtP - XmtLocalize(w, "AR %d failed", "AR %d failed"), - ar_id); - } else { -- XmtMsgLinePrintf(arsub_message, -+ XmtMsgLinePrintf(arsub_message, "%s", - XmtLocalize(w, "AR Submission failed", - "AR Submission failed")); - } -diff -up GE2011.11p1/source/clients/qmon/qmon_comm.c.format GE2011.11p1/source/clients/qmon/qmon_comm.c ---- GE2011.11p1/source/clients/qmon/qmon_comm.c.format 2012-05-23 13:04:47.000000000 -0600 -+++ GE2011.11p1/source/clients/qmon/qmon_comm.c 2014-10-03 21:11:16.290851379 -0600 -@@ -221,7 +221,7 @@ lList **answerp - } - - if (ctx->is_alive(ctx) != CL_RETVAL_OK) { -- sprintf(msg, XmtLocalize(AppShell, "cannot reach qmaster", "cannot reach qmaster")); -+ sprintf(msg, "%s", XmtLocalize(AppShell, "cannot reach qmaster", "cannot reach qmaster")); - contact_ok = XmtDisplayErrorAndAsk(AppShell, "nocontact", - msg, "@{Retry}", "@{Abort}", - XmtYesButton, NULL); -diff -up GE2011.11p1/source/clients/qmon/qmon_main.c.format GE2011.11p1/source/clients/qmon/qmon_main.c ---- GE2011.11p1/source/clients/qmon/qmon_main.c.format 2012-05-23 13:04:47.000000000 -0600 -+++ GE2011.11p1/source/clients/qmon/qmon_main.c 2014-10-03 21:11:16.290851379 -0600 -@@ -359,19 +359,19 @@ static void qmonUsage(Widget w) - - printf("%s %s\n", GE_SHORTNAME, GDI_VERSION); - /* printf("%s\n", feature_get_product_name(FS_SHORT_VERSION, &ds)); */ -- printf(XmtLocalize2(w, "usage: qmon\n", "qmon_usage", "usageTitle")); -+ printf("%s", XmtLocalize2(w, "usage: qmon\n", "qmon_usage", "usageTitle")); - printf(" [-cmap] "); -- printf(XmtLocalize2(w, "use own colormap\n", "qmon_usage", "cmapOption")); -+ printf("%s", XmtLocalize2(w, "use own colormap\n", "qmon_usage", "cmapOption")); - printf(" [-help] "); -- printf(XmtLocalize2(w, "show this information and exit\n", -+ printf("%s", XmtLocalize2(w, "show this information and exit\n", - "qmon_usage", "helpOption")); - printf(" [-fontFamily {big|medium|small}] "); -- printf(XmtLocalize2(w, "use small/medium/big fonts\n", -+ printf("%s", XmtLocalize2(w, "use small/medium/big fonts\n", - "qmon_usage", "fontFamilyOption")); - printf(" [-nologo] "); -- printf(XmtLocalize2(w, "startup without logo\n", -+ printf("%s", XmtLocalize2(w, "startup without logo\n", - "qmon_usage", "nologoOption")); -- printf(XmtLocalize2(w, "Additionally the default X commandline switches can be used.\nFor further information see the manual page X(1)\n", -+ printf("%s", XmtLocalize2(w, "Additionally the default X commandline switches can be used.\nFor further information see the manual page X(1)\n", - "qmon_usage", "X11OptionInfo")); - - DEXIT; -diff -up GE2011.11p1/source/clients/qmon/qmon_message.c.format GE2011.11p1/source/clients/qmon/qmon_message.c ---- GE2011.11p1/source/clients/qmon/qmon_message.c.format 2012-05-23 13:04:47.000000000 -0600 -+++ GE2011.11p1/source/clients/qmon/qmon_message.c 2014-10-03 21:11:16.290851379 -0600 -@@ -86,7 +86,7 @@ void qmonMessageShow(Widget w, Boolean m - } - - if (msg_box) { -- XmtDisplayWarningMsg(w, "XmtMessageBox", buf, "Warning", NULL); -+ XmtDisplayWarningMsg(w, "XmtMessageBox", "%x", "Warning", NULL, buf); - XSync(XtDisplay(w), 0); - XmUpdateDisplay(w); - } -diff -up GE2011.11p1/source/clients/qmon/qmon_preferences.c.format GE2011.11p1/source/clients/qmon/qmon_preferences.c ---- GE2011.11p1/source/clients/qmon/qmon_preferences.c.format 2012-05-23 13:04:46.000000000 -0600 -+++ GE2011.11p1/source/clients/qmon/qmon_preferences.c 2014-10-03 21:11:16.291851402 -0600 -@@ -469,7 +469,7 @@ static lListElem* read_object( const cha - if (!(ep = lCreateElem(args->objtype))) { - FCLOSE(fp); - free(buf); -- ERROR((SGE_EVENT, MSG_SGETEXT_NOMEM)); -+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_NOMEM)); - DEXIT; - return NULL; - } -@@ -477,7 +477,7 @@ static lListElem* read_object( const cha - /* read in config file */ - if (read_config_list(fp, &clp, &alp, CF_Type, CF_name, CF_value, - CF_sublist, NULL, read_config_list_flag, buf, size)) { -- ERROR((SGE_EVENT, lGetString(lFirst(alp), AN_text))); -+ ERROR((SGE_EVENT, "%s", lGetString(lFirst(alp), AN_text))); - lFreeList(&alp); - FCLOSE(fp); - free(buf); -@@ -492,7 +492,7 @@ static lListElem* read_object( const cha - ret = args->work_func(&alp, &clp, fields, ep, spool, flag, tag, 0); - if (ret) { - if (alp) -- ERROR((SGE_EVENT, lGetString(lFirst(alp), AN_text))); -+ ERROR((SGE_EVENT, "%s", lGetString(lFirst(alp), AN_text))); - lFreeList(&alp); - lFreeList(&clp); - lFreeElem(&ep); -diff -up GE2011.11p1/source/clients/qmon/qmon_submit.c.format GE2011.11p1/source/clients/qmon/qmon_submit.c ---- GE2011.11p1/source/clients/qmon/qmon_submit.c.format 2012-05-23 13:04:47.000000000 -0600 -+++ GE2011.11p1/source/clients/qmon/qmon_submit.c 2014-10-03 21:11:16.292851425 -0600 -@@ -1366,7 +1366,7 @@ static void qmonSubmitJobSubmit(Widget w - */ - if ((!SMData.job_script || SMData.job_script[0] == '\0') && - !ISSET(submit_mode_data.sub_mode, SUBMIT_QSH)) { -- sprintf(buf, XmtLocalize(w, "Job Script required !", -+ sprintf(buf, "%s", XmtLocalize(w, "Job Script required !", - "Job Script required !")); - goto error; - } -@@ -1381,7 +1381,7 @@ static void qmonSubmitJobSubmit(Widget w - pe = strtok(theInput, " "); - pe_range = strtok(NULL, "\n"); - if (!(pe_range && pe_range[0] != '\0')) { -- sprintf(buf, -+ sprintf(buf, "%s", - XmtLocalize(w, - "Parallel Environment requires valid name and valid range !", - "Parallel Environment requires valid name and valid range !") -@@ -1394,7 +1394,7 @@ static void qmonSubmitJobSubmit(Widget w - 1, 0, INF_ALLOWED); - lFreeList(&range_list); - if (alp) { -- sprintf(buf, -+ sprintf(buf, "%s", - XmtLocalize(w, - "Parallel Environment requires valid name and valid range !", - "Parallel Environment requires valid name and valid range !") -@@ -1407,7 +1407,7 @@ static void qmonSubmitJobSubmit(Widget w - - if (!(lp = lCreateElemList("JobSubmitList", JB_Type, 1))) { - DPRINTF(("lCreateElemList failure\n")); -- sprintf(buf, -+ sprintf(buf, "%s", - XmtLocalize(w, - "Job submission failed", - "Job submission failed") -@@ -1417,7 +1417,7 @@ static void qmonSubmitJobSubmit(Widget w - - if (!qmonSMToCull(&SMData, lFirst(lp), 0)) { - DPRINTF(("qmonSMToCull failure\n")); -- sprintf(buf, -+ sprintf(buf, "%s", - XmtLocalize(w, - "Job submission failed", - "Job submission failed") -@@ -1431,7 +1431,7 @@ static void qmonSubmitJobSubmit(Widget w - if (set_sec_cred(sge_root, mastername, lFirst(lp), &alp) != 0) { - qmonMessageBox(w, alp, true); - lFreeList(&alp); -- sprintf(buf, MSG_SEC_SETJOBCRED); -+ sprintf(buf, "%s", MSG_SEC_SETJOBCRED); - sprintf(buf, "\n"); - goto error; - } -@@ -1481,7 +1481,7 @@ static void qmonSubmitJobSubmit(Widget w - XmtLocalize(w, "Job %d failed", "Job %d failed"), - jobid); - else -- XmtMsgLinePrintf(submit_message, -+ XmtMsgLinePrintf(submit_message, "%s", - XmtLocalize(w, "Job Submission failed", - "Job Submission failed")); - XmtMsgLineClear(submit_message, DISPLAY_MESSAGE_DURATION); -diff -up GE2011.11p1/source/clients/qmon/qmon_ticket.c.format GE2011.11p1/source/clients/qmon/qmon_ticket.c ---- GE2011.11p1/source/clients/qmon/qmon_ticket.c.format 2012-05-23 13:04:46.000000000 -0600 -+++ GE2011.11p1/source/clients/qmon/qmon_ticket.c 2014-10-03 21:11:16.292851425 -0600 -@@ -503,9 +503,9 @@ static void qmonTOVApply(Widget w, XtPoi - qmonMessageBox(w, alp, 0); - - if (alp && lGetUlong(lFirst(alp), AN_status) != STATUS_OK) -- XmtMsgLinePrintf(tov_message, XmtLocalize(w, "Failure", "Failure")); -+ XmtMsgLinePrintf(tov_message, "%s", XmtLocalize(w, "Failure", "Failure")); - else -- XmtMsgLinePrintf(tov_message, XmtLocalize(w, "Success", "Success")); -+ XmtMsgLinePrintf(tov_message, "%s", XmtLocalize(w, "Success", "Success")); - XmtMsgLineClear(tov_message, DISPLAY_MESSAGE_DURATION); - - data_changed = False; -diff -up GE2011.11p1/source/clients/qmon/qmon_timer.c.format GE2011.11p1/source/clients/qmon/qmon_timer.c ---- GE2011.11p1/source/clients/qmon/qmon_timer.c.format 2012-05-23 13:04:47.000000000 -0600 -+++ GE2011.11p1/source/clients/qmon/qmon_timer.c 2014-10-03 21:11:16.292851425 -0600 -@@ -393,7 +393,7 @@ XtIntervalId *id - DENTER(GUI_LAYER, "qmonTimerCheckInteractiveJob"); - - if (ctx->is_alive(ctx) != CL_RETVAL_OK) { -- sprintf(msg, XmtLocalize(AppShell, "cannot reach qmaster", "cannot reach qmaster")); -+ sprintf(msg, "%s", XmtLocalize(AppShell, "cannot reach qmaster", "cannot reach qmaster")); - contact_ok = XmtDisplayErrorAndAsk(AppShell, "nocontact", - msg, "@{Retry}", "@{Abort}", - XmtYesButton, NULL); -diff -up GE2011.11p1/source/clients/qmon/qmon_util.c.format GE2011.11p1/source/clients/qmon/qmon_util.c ---- GE2011.11p1/source/clients/qmon/qmon_util.c.format 2012-05-23 13:04:46.000000000 -0600 -+++ GE2011.11p1/source/clients/qmon/qmon_util.c 2014-10-03 21:11:16.293851448 -0600 -@@ -960,7 +960,7 @@ void XmListAddItemUniqueSorted(Widget li - if (item[0] == '@' && item[1] != '{') - sprintf(buf, "@%s", item); - else -- sprintf(buf, item); -+ sprintf(buf, "%s", item); - xmitem = XmtCreateLocalizedXmString(list, buf); - if (XmListItemExists(list, xmitem)) { - XmStringFree(xmitem); -diff -up GE2011.11p1/source/clients/qrsh/qrsh_starter.c.format GE2011.11p1/source/clients/qrsh/qrsh_starter.c ---- GE2011.11p1/source/clients/qrsh/qrsh_starter.c.format 2012-05-23 13:04:47.000000000 -0600 -+++ GE2011.11p1/source/clients/qrsh/qrsh_starter.c 2014-10-03 21:11:16.293851448 -0600 -@@ -239,7 +239,7 @@ static char *setEnvironment(const char * - strcpy(command, line + 13); - } else if (strncmp(line, "QRSH_WRAPPER=", 13) == 0) { - if (*(line + 13) == 0) { -- fprintf(stderr, MSG_QRSH_STARTER_EMPTY_WRAPPER); -+ fprintf(stderr, "%s", MSG_QRSH_STARTER_EMPTY_WRAPPER); - fprintf(stderr, "\n"); - } else { - if ((*wrapper = (char *)malloc(strlen(line) - 13 + 1)) == NULL) { -diff -up GE2011.11p1/source/clients/qrstat/qrstat_report_handler_xml.c.format GE2011.11p1/source/clients/qrstat/qrstat_report_handler_xml.c ---- GE2011.11p1/source/clients/qrstat/qrstat_report_handler_xml.c.format 2012-05-23 13:04:47.000000000 -0600 -+++ GE2011.11p1/source/clients/qrstat/qrstat_report_handler_xml.c 2014-10-03 21:11:16.293851448 -0600 -@@ -261,7 +261,7 @@ qrstat_report_finish(qrstat_report_handl - DENTER(TOP_LAYER, "qrstat_report_finish"); - - sge_dstring_append(buffer, "</qrstat>\n"); -- printf(sge_dstring_get_string((dstring *)handler->ctx)); -+ printf("%s", sge_dstring_get_string((dstring *)handler->ctx)); - - DRETURN(ret); - } -diff -up GE2011.11p1/source/clients/qsh/parse_job_qsh.c.format GE2011.11p1/source/clients/qsh/parse_job_qsh.c ---- GE2011.11p1/source/clients/qsh/parse_job_qsh.c.format 2012-05-23 13:04:45.000000000 -0600 -+++ GE2011.11p1/source/clients/qsh/parse_job_qsh.c 2014-10-03 21:11:16.294851472 -0600 -@@ -288,7 +288,7 @@ lList *cull_parse_qsh_parameter(u_long32 - char str[1024]; - - lRemoveElem(cmdline, &ep); -- sprintf(str, MSG_ANSWER_HELPNOTALLOWEDINCONTEXT); -+ sprintf(str, "%s", MSG_ANSWER_HELPNOTALLOWEDINCONTEXT); - answer_list_add(&answer, str, STATUS_ENOIMP, ANSWER_QUALITY_ERROR); - lFreeList(&path_alias); - DEXIT; -diff -up GE2011.11p1/source/clients/qsh/qsh.c.format GE2011.11p1/source/clients/qsh/qsh.c ---- GE2011.11p1/source/clients/qsh/qsh.c.format 2012-05-23 13:04:45.000000000 -0600 -+++ GE2011.11p1/source/clients/qsh/qsh.c 2014-10-03 21:11:16.294851472 -0600 -@@ -450,7 +450,7 @@ static char *read_from_qrsh_socket(int m - return NULL; - } else { - if (rval == 0) { -- ERROR((SGE_EVENT, MSG_QSH_ERRORENDINGCONNECTION)); -+ ERROR((SGE_EVENT, "%s", MSG_QSH_ERRORENDINGCONNECTION)); - DEXIT; - return NULL; - } -@@ -501,7 +501,7 @@ static int get_remote_exit_code(int sock - - DENTER(TOP_LAYER, "get_remote_exit_code"); - -- VERBOSE_LOG((stderr, MSG_QSH_READINGEXITCODEFROMSHEPHERD)); -+ VERBOSE_LOG((stderr, "%s", MSG_QSH_READINGEXITCODEFROMSHEPHERD)); - - msgsock = wait_for_qrsh_socket(sock, QSH_SOCKET_FINAL_TIMEOUT); - if (msgsock != -1) { -@@ -518,7 +518,7 @@ static int get_remote_exit_code(int sock - } - } - -- ERROR((SGE_EVENT, MSG_QSH_ERRORREADINGRETURNCODEOFREMOTECOMMAND)); -+ ERROR((SGE_EVENT, "%s", MSG_QSH_ERRORREADINGRETURNCODEOFREMOTECOMMAND)); - DEXIT; - return -1; - } -@@ -567,7 +567,7 @@ static const char *quote_argument(const - new_arg = malloc(strlen(arg) + 3); - - if (new_arg == NULL) { -- ERROR((SGE_EVENT, MSG_QSH_MALLOCFAILED)); -+ ERROR((SGE_EVENT, "%s", MSG_QSH_MALLOCFAILED)); - DEXIT; - return NULL; - } -@@ -762,7 +762,7 @@ static int start_client_program(const ch - - /* create an argument list */ - if (!sge_sl_create(&sl_args)) { -- ERROR((SGE_EVENT, MSG_SGETEXT_NOMEM)); -+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_NOMEM)); - exit(EXIT_FAILURE); - } - -@@ -1020,7 +1020,7 @@ get_client_name(sge_gdi_ctx_class_t *ctx - /* get configuration from qmaster */ - if (gdi2_get_configuration(ctx, qualified_hostname, &global, &local) || - merge_configuration(NULL, progid, cell_root, global, local, &conf_list)) { -- ERROR((SGE_EVENT, MSG_CONFIG_CANTGETCONFIGURATIONFROMQMASTER)); -+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_CANTGETCONFIGURATIONFROMQMASTER)); - lFreeList(&conf_list); - lFreeElem(&global); - lFreeElem(&local); -@@ -1031,7 +1031,7 @@ get_client_name(sge_gdi_ctx_class_t *ctx - /* search for config entry */ - qlogin_cmd_elem = lGetElemStr(conf_list, CF_name, config_name); - if (qlogin_cmd_elem == NULL) { -- ERROR((SGE_EVENT, MSG_CONFIG_CANTGETCONFIGURATIONFROMQMASTER)); -+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_CANTGETCONFIGURATIONFROMQMASTER)); - lFreeList(&conf_list); - lFreeElem(&global); - lFreeElem(&local); -@@ -2004,7 +2004,7 @@ int main(int argc, char **argv) - } - } - -- VERBOSE_LOG((stderr, MSG_QSH_WAITINGFORINTERACTIVEJOBTOBESCHEDULED)); -+ VERBOSE_LOG((stderr, "%s", MSG_QSH_WAITINGFORINTERACTIVEJOBTOBESCHEDULED)); - - DPRINTF(("R E A D I N G J O B ! ! ! ! ! ! ! ! ! ! !\n")); - DPRINTF(("============================================\n")); -@@ -2186,7 +2186,7 @@ int main(int argc, char **argv) - - do_shut = shut_me_down; - if (do_shut || do_exit) { -- WARNING((SGE_EVENT, MSG_QSH_REQUESTFORINTERACTIVEJOBHASBEENCANCELED)); -+ WARNING((SGE_EVENT, "%s", MSG_QSH_REQUESTFORINTERACTIVEJOBHASBEENCANCELED)); - delete_job(ctx, job_id, lp_jobs); - lFreeList(&lp_poll); - do_exit = 1; -@@ -2259,7 +2259,7 @@ int main(int argc, char **argv) - * so exit qrsh/qlogin with real exit_status. - */ - if (g_new_interactive_job_support == false) { -- WARNING((SGE_EVENT, MSG_QSH_CANTSTARTINTERACTIVEJOB)); -+ WARNING((SGE_EVENT, "%s", MSG_QSH_CANTSTARTINTERACTIVEJOB)); - do_exit = 1; - exit_status = 1; - } else { -diff -up GE2011.11p1/source/clients/qstat/qstat.c.format GE2011.11p1/source/clients/qstat/qstat.c ---- GE2011.11p1/source/clients/qstat/qstat.c.format 2012-05-23 13:04:46.000000000 -0600 -+++ GE2011.11p1/source/clients/qstat/qstat.c 2014-10-03 21:11:16.295851495 -0600 -@@ -1697,7 +1697,7 @@ static int qstat_stdout_queue_load_alarm - { - DENTER(TOP_LAYER, "qstat_stdout_queue_load_alarm"); - printf("\t"); -- printf(reason); -+ printf("%s", reason); - printf("\n"); - DEXIT; - return 0; -@@ -1707,7 +1707,7 @@ static int qstat_stdout_queue_suspend_al - { - DENTER(TOP_LAYER, "qstat_stdout_queue_suspend_alarm"); - printf("\t"); -- printf(reason); -+ printf("%s", reason); - printf("\n"); - DEXIT; - return 0; -@@ -1717,7 +1717,7 @@ static int qstat_stdout_queue_message(qs - { - DENTER(TOP_LAYER, "qstat_stdout_queue_message"); - printf("\t"); -- printf(message); -+ printf("%s", message); - printf("\n"); - DEXIT; - return 0; -diff -up GE2011.11p1/source/clients/qstat/qstat_cmdline.c.format GE2011.11p1/source/clients/qstat/qstat_cmdline.c ---- GE2011.11p1/source/clients/qstat/qstat_cmdline.c.format 2012-05-23 13:04:46.000000000 -0600 -+++ GE2011.11p1/source/clients/qstat/qstat_cmdline.c 2014-10-03 21:11:16.295851495 -0600 -@@ -302,7 +302,7 @@ qstat_usage(int qselect_mode, FILE *fp, - } - - if (getenv("MORE_INFO")) { -- fprintf(fp, MSG_QSTAT_USAGE_ADDITIONALDEBUGGINGOPTIONS); -+ fprintf(fp, "%s", MSG_QSTAT_USAGE_ADDITIONALDEBUGGINGOPTIONS); - fprintf(fp, " [-dj] %s\n",MSG_QSTAT_USAGE_DUMPCOMPLETEJOBLISTTOSTDOUT); - fprintf(fp, " [-dq] %s\n",MSG_QSTAT_USAGE_DUMPCOMPLETEQUEUELISTTOSTDOUT); - } -diff -up GE2011.11p1/source/clients/qsub/qsub.c.format GE2011.11p1/source/clients/qsub/qsub.c ---- GE2011.11p1/source/clients/qsub/qsub.c.format 2012-05-23 13:04:47.000000000 -0600 -+++ GE2011.11p1/source/clients/qsub/qsub.c 2014-10-03 21:11:16.296851518 -0600 -@@ -361,7 +361,7 @@ main(int argc, char **argv) - } - printf("\n"); - } else { -- printf(MSG_JOB_VERIFYFOUNDQ); -+ printf("%s", MSG_JOB_VERIFYFOUNDQ); - printf("\n"); - } - -@@ -702,5 +702,5 @@ static int report_exit_status(int stat, - *******************************************************************************/ - static void error_handler(const char *message) - { -- fprintf(stderr, message); -+ fprintf(stderr, "%s", message); - } -diff -up GE2011.11p1/source/common/parse_job_cull.c.format GE2011.11p1/source/common/parse_job_cull.c ---- GE2011.11p1/source/common/parse_job_cull.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/common/parse_job_cull.c 2014-10-03 21:11:16.296851518 -0600 -@@ -361,7 +361,7 @@ lList *cull_parse_job_parameter(u_long32 - - if ((ep = lGetElemStr(cmdline, SPA_switch, "-help"))) { - lRemoveElem(cmdline, &ep); -- sprintf(error_string, MSG_ANSWER_HELPNOTALLOWEDINCONTEXT); -+ sprintf(error_string, "%s", MSG_ANSWER_HELPNOTALLOWEDINCONTEXT); - answer_list_add(&answer, error_string, - STATUS_ENOIMP, ANSWER_QUALITY_ERROR); - DRETURN(answer); -diff -up GE2011.11p1/source/common/parse_qsub.c.format GE2011.11p1/source/common/parse_qsub.c ---- GE2011.11p1/source/common/parse_qsub.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/common/parse_qsub.c 2014-10-03 21:11:16.297851542 -0600 -@@ -1814,7 +1814,7 @@ DTRACE; - - sp++; - if (!*sp) { -- sprintf(str, MSG_PARSE_ATSIGNOPTIONMUSTHAVEFILEARGUMENT); -+ sprintf(str, "%s", MSG_PARSE_ATSIGNOPTIONMUSTHAVEFILEARGUMENT); - answer_list_add(&answer, str, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR); - DEXIT; - return answer; -diff -up GE2011.11p1/source/daemons/common/admin_mail.c.format GE2011.11p1/source/daemons/common/admin_mail.c ---- GE2011.11p1/source/daemons/common/admin_mail.c.format 2012-05-23 13:04:37.000000000 -0600 -+++ GE2011.11p1/source/daemons/common/admin_mail.c 2014-10-03 21:11:16.297851542 -0600 -@@ -236,7 +236,7 @@ void job_related_adminmail(u_long32 prog - sprintf(str_general, MSG_GFSTATE_JOB_U, sge_u32c(jobid)); - } - else { -- sprintf(str_general, MSG_NONE); -+ sprintf(str_general, "%s", MSG_NONE); - } - } else { - /* This is a pe task */ -diff -up GE2011.11p1/source/daemons/common/mail.c.format GE2011.11p1/source/daemons/common/mail.c ---- GE2011.11p1/source/daemons/common/mail.c.format 2012-05-23 13:04:38.000000000 -0600 -+++ GE2011.11p1/source/daemons/common/mail.c 2014-10-03 21:11:16.297851542 -0600 -@@ -101,7 +101,7 @@ void cull_mail(u_long32 progid, lList *u - user = lGetString(ep, MR_user); - host = lGetHost(ep, MR_host); - if (!user && !host) { -- ERROR((SGE_EVENT, MSG_MAIL_EMPTYUSERHOST)); -+ ERROR((SGE_EVENT, "%s", MSG_MAIL_EMPTYUSERHOST)); - FREE(mailer); - DRETURN_VOID; - } else if (!host) { -@@ -277,13 +277,13 @@ const char *buf - alarm(0); - if (pid2 == 0) { /* how could this happen? */ - kill(pid, SIGKILL); -- ERROR((SGE_EVENT, MSG_MAIL_NOMAIL1)); -+ ERROR((SGE_EVENT, "%s", MSG_MAIL_NOMAIL1)); - exit(1); - } - - if (pid2 == -1) { /* alarm must have went off */ - kill(pid, SIGKILL); -- ERROR((SGE_EVENT, MSG_MAIL_NOMAIL2)); -+ ERROR((SGE_EVENT, "%s", MSG_MAIL_NOMAIL2)); - exit(1); - } - -diff -up GE2011.11p1/source/daemons/common/procfs.c.format GE2011.11p1/source/daemons/common/procfs.c ---- GE2011.11p1/source/daemons/common/procfs.c.format 2012-05-23 13:04:38.000000000 -0600 -+++ GE2011.11p1/source/daemons/common/procfs.c 2014-10-03 21:11:16.298851565 -0600 -@@ -206,7 +206,7 @@ void procfs_kill_addgrpid(gid_t add_grp_ - if (shepherd_trace) { - char err_str[256]; - -- sprintf(err_str, MSG_SGE_NGROUPS_MAXOSRECONFIGURATIONNECESSARY ); -+ sprintf(err_str, "%s", MSG_SGE_NGROUPS_MAXOSRECONFIGURATIONNECESSARY ); - shepherd_trace(err_str); - } - /* -@@ -222,7 +222,7 @@ void procfs_kill_addgrpid(gid_t add_grp_ - if (shepherd_trace) { - char err_str[256]; - -- sprintf(err_str, MSG_SGE_PROCFSKILLADDGRPIDMALLOCFAILED ); -+ sprintf(err_str, "%s", MSG_SGE_PROCFSKILLADDGRPIDMALLOCFAILED ); - shepherd_trace(err_str); - } - -@@ -416,14 +416,14 @@ time_t last_time - - max_groups = sge_sysconf(SGE_SYSCONF_NGROUPS_MAX); - if (max_groups <= 0) { -- ERROR((SGE_EVENT, MSG_SGE_NGROUPS_MAXOSRECONFIGURATIONNECESSARY)); -+ ERROR((SGE_EVENT, "%s", MSG_SGE_NGROUPS_MAXOSRECONFIGURATIONNECESSARY)); - DEXIT; - return 1; - } - - list = (gid_t*) malloc(max_groups*sizeof(gid_t)); - if (list == NULL) { -- ERROR((SGE_EVENT, MSG_SGE_PTDISPATCHPROCTOJOBMALLOCFAILED)); -+ ERROR((SGE_EVENT, "%s", MSG_SGE_PTDISPATCHPROCTOJOBMALLOCFAILED)); - DEXIT; - return 1; - } -diff -up GE2011.11p1/source/daemons/common/qmaster_heartbeat.c.format GE2011.11p1/source/daemons/common/qmaster_heartbeat.c ---- GE2011.11p1/source/daemons/common/qmaster_heartbeat.c.format 2012-05-23 13:04:37.000000000 -0600 -+++ GE2011.11p1/source/daemons/common/qmaster_heartbeat.c 2014-10-03 21:11:16.298851565 -0600 -@@ -65,7 +65,7 @@ int get_qmaster_heartbeat( char *file, i - DENTER(TOP_LAYER, "get_qmaster_heartbeat"); - - if (file == NULL) { -- ERROR((SGE_EVENT, MSG_HEART_NO_FILENAME)); -+ ERROR((SGE_EVENT, "%s", MSG_HEART_NO_FILENAME)); - DEXIT; - return -1; - } -@@ -138,7 +138,7 @@ int inc_qmaster_heartbeat(char *file, in - DENTER(TOP_LAYER, "inc_qmaster_heartbeat"); - - if (file == NULL) { -- ERROR((SGE_EVENT, MSG_HEART_NO_FILENAME)); -+ ERROR((SGE_EVENT, "%s", MSG_HEART_NO_FILENAME)); - DEXIT; - return -1; - } -diff -up GE2011.11p1/source/daemons/common/startprog.c.format GE2011.11p1/source/daemons/common/startprog.c ---- GE2011.11p1/source/daemons/common/startprog.c.format 2012-05-23 13:04:37.000000000 -0600 -+++ GE2011.11p1/source/daemons/common/startprog.c 2014-10-03 21:11:16.298851565 -0600 -@@ -210,7 +210,7 @@ pid_t pid - else if (WIFSIGNALED(status)) - exit_status = 8; - else { -- ERROR((SGE_EVENT, MSG_PROC_WAITPIDRETURNEDUNKNOWNSTATUS)); -+ ERROR((SGE_EVENT, "%s", MSG_PROC_WAITPIDRETURNEDUNKNOWNSTATUS)); - exit_status = 8; - } - -diff -up GE2011.11p1/source/daemons/common/unparse_job_cull.c.format GE2011.11p1/source/daemons/common/unparse_job_cull.c ---- GE2011.11p1/source/daemons/common/unparse_job_cull.c.format 2012-05-23 13:04:37.000000000 -0600 -+++ GE2011.11p1/source/daemons/common/unparse_job_cull.c 2014-10-03 21:11:16.299851588 -0600 -@@ -176,7 +176,7 @@ int flags - ret = uni_print_list(NULL, str, sizeof(str) - 1, lp, fields, delis, 0); - if (ret) { - DPRINTF(("Error %d formatting jid_request_list as -hold_jid\n", ret)); -- sprintf(str, MSG_LIST_ERRORFORMATINGJIDPREDECESSORLISTASHOLDJID); -+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGJIDPREDECESSORLISTASHOLDJID); - answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - return answer; - } -@@ -194,7 +194,7 @@ int flags - ret = uni_print_list(NULL, str, sizeof(str) - 1, lp, fields, delis, 0); - if (ret) { - DPRINTF(("Error %d formatting ja_ad_request_list as -hold_jid_ad\n", ret)); -- sprintf(str, MSG_LIST_ERRORFORMATINGJIDPREDECESSORLISTASHOLDJIDAD); -+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGJIDPREDECESSORLISTASHOLDJIDAD); - answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - return answer; - } -@@ -230,7 +230,7 @@ int flags - 0); - if (ret) { - DPRINTF(("Error %d formatting job_identifier_list as -jid\n", ret)); -- sprintf(str, MSG_LIST_ERRORFORMATINGJOBIDENTIFIERLISTASJID); -+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGJOBIDENTIFIERLISTASJID); - answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - return answer; - } -@@ -277,7 +277,7 @@ int flags - cp = sge_unparse_mail_options(ul); - if (!cp) { - DPRINTF(("Error unparsing mail options\n")); -- sprintf(str, MSG_PARSE_ERRORUNPARSINGMAILOPTIONS); -+ sprintf(str, "%s", MSG_PARSE_ERRORUNPARSINGMAILOPTIONS); - answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - return answer; - } -@@ -318,7 +318,7 @@ int flags - FLG_NO_DELIS_STRINGS); - if (ret) { - DPRINTF(("Error %d formatting mail list as -M\n", ret)); -- sprintf(str, MSG_LIST_ERRORFORMATTINGMAILLISTASM ); -+ sprintf(str, "%s", MSG_LIST_ERRORFORMATTINGMAILLISTASM ); - answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - return answer; - } -@@ -363,13 +363,13 @@ int flags - - prty = ul - BASE_PRIORITY; - if (prty > 1024) { -- sprintf(str, MSG_PROC_INVALIDPROIRITYMUSTBELESSTHAN1025); -+ sprintf(str, "%s", MSG_PROC_INVALIDPROIRITYMUSTBELESSTHAN1025); - answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - DEXIT; - return answer; - } - if (prty < -1023) { -- sprintf(str, MSG_PROC_INVALIDPRIORITYMUSTBEGREATERTHANMINUS1024); -+ sprintf(str, "%s", MSG_PROC_INVALIDPRIORITYMUSTBEGREATERTHANMINUS1024); - answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - DEXIT; - return answer; -@@ -403,7 +403,7 @@ int flags - FLG_NO_DELIS_STRINGS); - if (ret) { - DPRINTF(("Error %d formatting hard_queue_list as -q\n", ret)); -- sprintf(str, MSG_LIST_ERRORFORMATINGHARDQUEUELISTASQ); -+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGHARDQUEUELISTASQ); - answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - return answer; - } -@@ -420,7 +420,7 @@ int flags - FLG_NO_DELIS_STRINGS); - if (ret) { - DPRINTF(("Error %d formatting soft_queue_list as -q\n", ret)); -- sprintf(str, MSG_LIST_ERRORFORMATINGSOFTQUEUELISTASQ); -+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGSOFTQUEUELISTASQ); - answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - return answer; - } -@@ -488,7 +488,7 @@ int flags - FLG_NO_DELIS_STRINGS); - if (ret) { - DPRINTF(("Error %d formatting environment list as -v\n", ret)); -- sprintf(str, MSG_LIST_ERRORFORMATINGENVIRONMENTLISTASV); -+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGENVIRONMENTLISTASV); - answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - return answer; - } -@@ -527,7 +527,7 @@ int flags - FLG_NO_DELIS_STRINGS); - if (ret) { - DPRINTF(("Error %d formatting job arguments\n", ret)); -- sprintf(str, MSG_LIST_ERRORFORMATINGJOBARGUMENTS); -+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGJOBARGUMENTS); - answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - return answer; - } -@@ -708,7 +708,7 @@ lList **alpp - ret = centry_list_append_to_string(lp, str, sizeof(str) - 1); - if (ret) { - DPRINTF(("Error %d formatting hard_resource_list as -l\n", ret)); -- sprintf(str, MSG_LIST_ERRORFORMATINGHARDRESOURCELISTASL); -+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGHARDRESOURCELISTASL); - answer_list_add(alpp, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - return ret; - } -@@ -751,7 +751,7 @@ lList **alpp - sge_dstring_append(&string_buffer, " "); - if (!(lp = lGetList(job, JB_pe_range))) { - DPRINTF(("Job has parallel environment with no ranges\n")); -- sprintf(str, MSG_JOB_JOBHASPEWITHNORANGES); -+ sprintf(str, "%s", MSG_JOB_JOBHASPEWITHNORANGES); - answer_list_add(alpp, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - sge_dstring_free(&string_buffer); - DEXIT; -@@ -767,7 +767,7 @@ lList **alpp - } - if (ret) { - DPRINTF(("Error %d formatting ranges in -pe\n", ret)); -- sprintf(str, MSG_LIST_ERRORFORMATINGRANGESINPE); -+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGRANGESINPE); - answer_list_add(alpp, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - sge_dstring_free(&string_buffer); - DEXIT; -@@ -805,7 +805,7 @@ lList **alpp - ret = uni_print_list(NULL, str, sizeof(str) - 1, lp, fields, delis, FLG_NO_DELIS_STRINGS); - if (ret) { - DPRINTF(("Error %d formatting path_list\n", ret)); -- sprintf(str, MSG_LIST_ERRORFORMATINGPATHLIST); -+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGPATHLIST); - answer_list_add(alpp, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - return ret; - } -diff -up GE2011.11p1/source/daemons/execd/dispatcher.c.format GE2011.11p1/source/daemons/execd/dispatcher.c ---- GE2011.11p1/source/daemons/execd/dispatcher.c.format 2012-05-23 13:04:38.000000000 -0600 -+++ GE2011.11p1/source/daemons/execd/dispatcher.c 2014-10-03 21:11:16.299851588 -0600 -@@ -247,7 +247,7 @@ int sge_execd_process_messages(sge_gdi_c - */ - sge_set_qmrestart_time(now); - sge_set_delay_job_reports_flag(true); -- INFO((SGE_EVENT, MSG_EXECD_ENABLEDELEAYDJOBREPORTING)); -+ INFO((SGE_EVENT, "%s", MSG_EXECD_ENABLEDELEAYDJOBREPORTING)); - - /* after a reconnect, we want to send a full load report - immediately */ - execd_trash_load_report(); -@@ -272,7 +272,7 @@ int sge_execd_process_messages(sge_gdi_c - if (sge_get_delay_job_reports_flag() && (now - sge_get_qmrestart_time() >= DELAYED_FINISHED_JOB_REPORTING_INTERVAL)) { - sge_set_delay_job_reports_flag(false); - sge_set_qmrestart_time(0); -- INFO((SGE_EVENT, MSG_EXECD_DISABLEDELEAYDJOBREPORTING)); -+ INFO((SGE_EVENT, "%s", MSG_EXECD_DISABLEDELEAYDJOBREPORTING)); - } - - if (now - last_alive_check >= alive_check_interval) { -diff -up GE2011.11p1/source/daemons/execd/execd.c.format GE2011.11p1/source/daemons/execd/execd.c ---- GE2011.11p1/source/daemons/execd/execd.c.format 2012-05-23 13:04:38.000000000 -0600 -+++ GE2011.11p1/source/daemons/execd/execd.c 2014-10-03 21:11:16.299851588 -0600 -@@ -237,7 +237,7 @@ int main(int argc, char **argv) - if (printed_points != 0) { - printf("\n"); - } -- CRITICAL((SGE_EVENT, MSG_COM_ERROR)); -+ CRITICAL((SGE_EVENT, "%s", MSG_COM_ERROR)); - SGE_EXIT((void**)&ctx, 1); - } - if (cl_com_get_handle(prognames[EXECD],1) == NULL) { -@@ -262,7 +262,7 @@ int main(int argc, char **argv) - */ - ret_val = cl_com_set_status_func(sge_execd_application_status); - if (ret_val != CL_RETVAL_OK) { -- ERROR((SGE_EVENT, cl_get_error_text(ret_val)) ); -+ ERROR((SGE_EVENT, "%s", cl_get_error_text(ret_val)) ); - } - - /* test connection */ -@@ -272,8 +272,8 @@ int main(int argc, char **argv) - (char *)ctx->get_master(ctx, true), - (char*)prognames[QMASTER], 1, &status); - if (ret_val != CL_RETVAL_OK) { -- ERROR((SGE_EVENT, cl_get_error_text(ret_val))); -- ERROR((SGE_EVENT, MSG_CONF_NOCONFBG)); -+ ERROR((SGE_EVENT, "%s", cl_get_error_text(ret_val))); -+ ERROR((SGE_EVENT, "%s", MSG_CONF_NOCONFBG)); - } - cl_com_free_sirm_message(&status); - } -@@ -339,15 +339,15 @@ int main(int argc, char **argv) - * Log a warning message if execd hasn't been started by a superuser - */ - if (!sge_is_start_user_superuser()) { -- WARNING((SGE_EVENT, MSG_SWITCH_USER_NOT_ROOT)); -+ WARNING((SGE_EVENT, "%s", MSG_SWITCH_USER_NOT_ROOT)); - } - - #ifdef COMPILE_DC - if (ptf_init()) { -- CRITICAL((SGE_EVENT, MSG_EXECD_NOSTARTPTF)); -+ CRITICAL((SGE_EVENT, "%s", MSG_EXECD_NOSTARTPTF)); - SGE_EXIT((void**)&ctx, 1); - } -- INFO((SGE_EVENT, MSG_EXECD_STARTPDCANDPTF)); -+ INFO((SGE_EVENT, "%s", MSG_EXECD_STARTPDCANDPTF)); - #endif - - master_job_list = object_type_get_master_list(SGE_TYPE_JOB); -@@ -650,7 +650,7 @@ static lList *sge_parse_execd(lList **pp - } - - if(lGetNumberOfElem(*ppcmdline)) { -- sprintf(str, MSG_PARSE_TOOMANYARGS); -+ sprintf(str, "%s", MSG_PARSE_TOOMANYARGS); - if(!usageshowed) - sge_usage(EXECD, stderr); - answer_list_add(&alp, str, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR); -diff -up GE2011.11p1/source/daemons/execd/execd_job_exec.c.format GE2011.11p1/source/daemons/execd/execd_job_exec.c ---- GE2011.11p1/source/daemons/execd/execd_job_exec.c.format 2012-05-23 13:04:38.000000000 -0600 -+++ GE2011.11p1/source/daemons/execd/execd_job_exec.c 2014-10-03 21:11:16.300851612 -0600 -@@ -97,7 +97,7 @@ int do_job_exec(sge_gdi_ctx_class_t *ctx - /* ------- featureset */ - if (unpackint(&(aMsg->buf), &feature_set)) - { -- ERROR((SGE_EVENT, MSG_COM_UNPACKFEATURESET)); -+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKFEATURESET)); - DRETURN(0); - } - -@@ -117,7 +117,7 @@ int do_job_exec(sge_gdi_ctx_class_t *ctx - - if (!object_unpack_elem_verify(&answer_list, &(aMsg->buf), &job, JB_Type)) { - answer_list_output(&answer_list); -- ERROR((SGE_EVENT, MSG_COM_UNPACKJOB)); -+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKJOB)); - DRETURN(0); - } - -@@ -161,7 +161,7 @@ int do_job_exec(sge_gdi_ctx_class_t *ctx - - if (!object_unpack_elem_verify(&answer_list, &(aMsg->buf), &petrep, PETR_Type)) { - answer_list_output(&answer_list); -- ERROR((SGE_EVENT, MSG_COM_UNPACKJOB)); -+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKJOB)); - DRETURN(0); - } - -@@ -198,7 +198,7 @@ int do_job_slave(sge_gdi_ctx_class_t *ct - - /* ------- featureset */ - if (unpackint(&(aMsg->buf), &feature_set)) { -- ERROR((SGE_EVENT, MSG_COM_UNPACKFEATURESET)); -+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKFEATURESET)); - DRETURN(0); - } - -@@ -211,7 +211,7 @@ int do_job_slave(sge_gdi_ctx_class_t *ct - /* ------- job */ - if (!object_unpack_elem_verify(&answer_list, &(aMsg->buf), &jelem, JB_Type)) { - answer_list_output(&answer_list); -- ERROR((SGE_EVENT, MSG_COM_UNPACKJOB)); -+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKJOB)); - DRETURN(0); - } - lFreeList(&answer_list); -diff -up GE2011.11p1/source/daemons/execd/execd_ticket.c.format GE2011.11p1/source/daemons/execd/execd_ticket.c ---- GE2011.11p1/source/daemons/execd/execd_ticket.c.format 2012-05-23 13:04:38.000000000 -0600 -+++ GE2011.11p1/source/daemons/execd/execd_ticket.c 2014-10-03 21:11:16.300851612 -0600 -@@ -66,7 +66,7 @@ int do_ticket(sge_gdi_ctx_class_t *ctx, - - if (unpackint(&(aMsg->buf), &jobid) || unpackint(&(aMsg->buf), &jataskid) - || unpackdouble(&(aMsg->buf), &ticket)) { -- ERROR((SGE_EVENT, MSG_JOB_TICKETFORMAT)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_TICKETFORMAT)); - DRETURN(0); - } - DPRINTF(("got %lf new tickets for job "sge_u32"."sge_u32"\n", ticket, jobid, jataskid)); -diff -up GE2011.11p1/source/daemons/execd/exec_job.c.format GE2011.11p1/source/daemons/execd/exec_job.c ---- GE2011.11p1/source/daemons/execd/exec_job.c.format 2012-05-23 13:04:38.000000000 -0600 -+++ GE2011.11p1/source/daemons/execd/exec_job.c 2014-10-03 21:11:16.301851635 -0600 -@@ -404,14 +404,14 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct - if (!(used_slots=qinstance_slots_used(master_q))) { - if (!(sge_make_tmpdir(master_q, job_id, ja_task_id, - pw->pw_uid, pw->pw_gid, tmpdir))) { -- snprintf(err_str, err_length, MSG_SYSTEM_CANTMAKETMPDIR); -+ snprintf(err_str, err_length, "%s", MSG_SYSTEM_CANTMAKETMPDIR); - DEXIT; - return -2; - } - } else { - SGE_STRUCT_STAT statbuf; - if(!(sge_get_tmpdir(master_q, job_id, ja_task_id, tmpdir))) { -- snprintf(err_str, err_length, MSG_SYSTEM_CANTGETTMPDIR); -+ snprintf(err_str, err_length, "%s", MSG_SYSTEM_CANTGETTMPDIR); - DEXIT; - return -2; - } -@@ -1037,7 +1037,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct - FREE(gid_range); - if (rlp == NULL) { - lFreeList(&alp); -- snprintf(err_str, err_length, MSG_EXECD_NOPARSEGIDRANGE); -+ snprintf(err_str, err_length, "%s", MSG_EXECD_NOPARSEGIDRANGE); - lFreeList(&environmentList); - FCLOSE(fp); - DEXIT; -@@ -1050,7 +1050,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct - while (addgrpid_already_in_use(last_addgrpid)) { - last_addgrpid = get_next_addgrpid (rlp, last_addgrpid); - if (temp_id == last_addgrpid) { -- snprintf(err_str, err_length, MSG_EXECD_NOADDGID); -+ snprintf(err_str, err_length, "%s", MSG_EXECD_NOADDGID); - lFreeList(&environmentList); - FCLOSE(fp); - DEXIT; -@@ -1426,7 +1426,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct - fprintf(fp, "exec_file=%s\n", xterm); - DPRINTF(("exec_file=%s\n", xterm)); - } else { -- snprintf(err_str, err_length, MSG_EXECD_NOXTERM); -+ snprintf(err_str, err_length, "%s", MSG_EXECD_NOXTERM); - FCLOSE(fp); - lFreeList(&environmentList); - sge_dstring_free(&core_binding_strategy_string); -@@ -1498,7 +1498,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct - */ - const char *error_string = lGetString(lFirst(answer_list), AN_text); - if(error_string != NULL) { -- snprintf(err_str, err_length, error_string); -+ snprintf(err_str, err_length, "%s", error_string); - } - lFreeList(&answer_list); - lFreeList(&environmentList); -@@ -1747,7 +1747,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct - set_token_cmd = mconf_get_set_token_cmd(); - if (!set_token_cmd || - !strlen(set_token_cmd) || !mconf_get_token_extend_time()) { -- snprintf(err_str, err_length, MSG_EXECD_AFSCONFINCOMPLETE); -+ snprintf(err_str, err_length, "%s", MSG_EXECD_AFSCONFINCOMPLETE); - FREE(pag_cmd); - FREE(shepherd_cmd); - DEXIT; -@@ -1767,7 +1767,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct - - cp = lGetString(jep, JB_tgt); - if (!cp || !(len = strlen(cp))) { -- snprintf(err_str, err_length, MSG_EXECD_TOKENZERO); -+ snprintf(err_str, err_length, "%s", MSG_EXECD_TOKENZERO); - FREE(pag_cmd); - FREE(shepherd_cmd); - DEXIT; -@@ -1990,7 +1990,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct - } - - FCLOSE_ERROR: -- CRITICAL((SGE_EVENT, MSG_EXECD_NOSTARTSHEPHERD)); -+ CRITICAL((SGE_EVENT, "%s", MSG_EXECD_NOSTARTSHEPHERD)); - - exit(1); - -diff -up GE2011.11p1/source/daemons/execd/job_report_execd.c.format GE2011.11p1/source/daemons/execd/job_report_execd.c ---- GE2011.11p1/source/daemons/execd/job_report_execd.c.format 2012-05-23 13:04:38.000000000 -0600 -+++ GE2011.11p1/source/daemons/execd/job_report_execd.c 2014-10-03 21:11:16.301851635 -0600 -@@ -103,7 +103,7 @@ lListElem *add_job_report(u_long32 jobid - jr_list = lCreateList("job report list", JR_Type); - - if (jr_list == NULL || (jr=lCreateElem(JR_Type)) == NULL) { -- ERROR((SGE_EVENT, MSG_JOB_TYPEMALLOC)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_TYPEMALLOC)); - DRETURN(NULL); - } - -@@ -278,7 +278,7 @@ int do_ack(sge_gdi_ctx_class_t *ctx, str - while (pb_unused(&(aMsg->buf)) > 0) { - - if (cull_unpack_elem(&(aMsg->buf), &ack, NULL)) { -- ERROR((SGE_EVENT, MSG_COM_UNPACKJOB)); -+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKJOB)); - DRETURN(0); - } - -@@ -355,7 +355,7 @@ int do_ack(sge_gdi_ctx_class_t *ctx, str - break; - - default: -- ERROR((SGE_EVENT, MSG_COM_ACK_UNKNOWN1)); -+ ERROR((SGE_EVENT, "%s", MSG_COM_ACK_UNKNOWN1)); - break; - } - -diff -up GE2011.11p1/source/daemons/execd/load_avg.c.format GE2011.11p1/source/daemons/execd/load_avg.c ---- GE2011.11p1/source/daemons/execd/load_avg.c.format 2012-05-23 13:04:38.000000000 -0600 -+++ GE2011.11p1/source/daemons/execd/load_avg.c 2014-10-03 21:11:16.302851658 -0600 -@@ -719,7 +719,7 @@ static int sge_get_loadavg(const char* q - - now = sge_get_gmt(); - if (now >= next_log) { -- WARNING((SGE_EVENT, MSG_SGETEXT_NO_LOAD)); -+ WARNING((SGE_EVENT, "%s", MSG_SGETEXT_NO_LOAD)); - next_log = now + 7200; - } - } else if (loads == -2) { -@@ -774,7 +774,7 @@ static int sge_get_loadavg(const char* q - if (sge_loadmem(&mem_info)) { - static int mem_fail = 0; - if (!mem_fail) { -- ERROR((SGE_EVENT, MSG_LOAD_NOMEMINDICES)); -+ ERROR((SGE_EVENT, "%s", MSG_LOAD_NOMEMINDICES)); - mem_fail =1; - } - DRETURN(1); -@@ -916,7 +916,7 @@ static int sge_get_loadavg(const char* q - - u_long32 now = sge_get_gmt(); - if (now >= next_log2) { -- WARNING((SGE_EVENT, MSG_SGETEXT_NO_LOAD)); -+ WARNING((SGE_EVENT, "%s", MSG_SGETEXT_NO_LOAD)); - next_log2 = now + 7200; - } - } -diff -up GE2011.11p1/source/daemons/execd/ptf.c.format GE2011.11p1/source/daemons/execd/ptf.c ---- GE2011.11p1/source/daemons/execd/ptf.c.format 2012-05-23 13:04:38.000000000 -0600 -+++ GE2011.11p1/source/daemons/execd/ptf.c 2014-10-03 21:11:16.302851658 -0600 -@@ -825,7 +825,7 @@ static lListElem *ptf_get_job_os(lList * - #endif - - if (!where) { -- CRITICAL((SGE_EVENT, MSG_WHERE_FAILEDTOBUILDWHERECONDITION)); -+ CRITICAL((SGE_EVENT, "%s", MSG_WHERE_FAILEDTOBUILDWHERECONDITION)); - DRETURN(NULL); - } - -diff -up GE2011.11p1/source/daemons/execd/reaper_execd.c.format GE2011.11p1/source/daemons/execd/reaper_execd.c ---- GE2011.11p1/source/daemons/execd/reaper_execd.c.format 2012-05-23 13:04:38.000000000 -0600 -+++ GE2011.11p1/source/daemons/execd/reaper_execd.c 2014-10-03 21:11:16.303851682 -0600 -@@ -420,7 +420,7 @@ static int clean_up_job(lListElem *jr, i - sge_dstring_init(&id_dstring, id_buffer, MAX_STRING_SIZE); - - if (!jr) { -- CRITICAL((SGE_EVENT, MSG_JOB_CLEANUPJOBCALLEDWITHINVALIDPARAMETERS)); -+ CRITICAL((SGE_EVENT, "%s", MSG_JOB_CLEANUPJOBCALLEDWITHINVALIDPARAMETERS)); - DEXIT; - return -1; - } -@@ -511,7 +511,7 @@ static int clean_up_job(lListElem *jr, i - - sprintf(error, MSG_STATUS_ABNORMALTERMINATIONOFSHEPHERDFORJOBXY_S, - job_get_id_string(job_id, ja_task_id, pe_task_id, &id_dstring)); -- ERROR((SGE_EVENT, error)); -+ ERROR((SGE_EVENT, "%s", error)); - - /* - * failed = ESSTATE_SHEPHERD_EXIT or exit status of shepherd if we are -@@ -525,7 +525,7 @@ static int clean_up_job(lListElem *jr, i - if (fscanf_count != 1) { - sprintf(error, MSG_STATUS_ABNORMALTERMINATIONFOSHEPHERDFORJOBXYEXITSTATEFILEISEMPTY_S, - job_get_id_string(job_id, ja_task_id, pe_task_id, &id_dstring)); -- ERROR((SGE_EVENT, error)); -+ ERROR((SGE_EVENT, "%s", error)); - /* - * If shepherd died through signal assume job was started, else - * trust exit status -@@ -553,9 +553,9 @@ static int clean_up_job(lListElem *jr, i - - if (failed) { - if (failed == ESSTATE_DIED_THRU_SIGNAL) -- sprintf(error, MSG_SHEPHERD_DIEDTHROUGHSIGNAL); -+ sprintf(error, "%s", MSG_SHEPHERD_DIEDTHROUGHSIGNAL); - else if (failed == ESSTATE_NO_PID) -- sprintf(error, MSG_SHEPHERD_NOPIDFILE); -+ sprintf(error, "%s", MSG_SHEPHERD_NOPIDFILE); - else - sprintf(error, MSG_SHEPHERD_EXITEDWISSTATUS_IS, failed, - get_sstate_description(failed)); -@@ -605,7 +605,7 @@ static int clean_up_job(lListElem *jr, i - job_get_id_string(job_id, ja_task_id, pe_task_id, &id_dstring)); - } - -- ERROR((SGE_EVENT, error)); -+ ERROR((SGE_EVENT, "%s", error)); - - if (!failed) { - failed = SSTATE_FAILURE_AFTER_JOB; -@@ -640,7 +640,7 @@ static int clean_up_job(lListElem *jr, i - if (!failed) { - failed = SSTATE_FAILURE_AFTER_JOB; - if (!*error) -- sprintf(error, MSG_JOB_CANTREADUSEDRESOURCESFORJOB); -+ sprintf(error, "%s", MSG_JOB_CANTREADUSEDRESOURCESFORJOB); - } - } - } -@@ -1218,7 +1218,7 @@ int clean_up_old_jobs(sge_gdi_ctx_class_ - DENTER(TOP_LAYER, "clean_up_old_jobs"); - - if (startup) { -- INFO((SGE_EVENT, MSG_SHEPHERD_CKECKINGFOROLDJOBS)); -+ INFO((SGE_EVENT, "%s", MSG_SHEPHERD_CKECKINGFOROLDJOBS)); - } - - /* -@@ -1243,9 +1243,9 @@ int clean_up_old_jobs(sge_gdi_ctx_class_ - !lost_children) { - if (lost_children) { - if (startup) { -- INFO((SGE_EVENT, MSG_SHEPHERD_NOOLDJOBSATSTARTUP)); -+ INFO((SGE_EVENT, "%s", MSG_SHEPHERD_NOOLDJOBSATSTARTUP)); - } else { -- INFO((SGE_EVENT, MSG_SHEPHERD_NOMOREOLDJOBSAFTERSTARTUP)); -+ INFO((SGE_EVENT, "%s", MSG_SHEPHERD_NOMOREOLDJOBSAFTERSTARTUP)); - } - /* - * Now setting lost_children to 0 which disables further pid checking -@@ -1261,7 +1261,7 @@ int clean_up_old_jobs(sge_gdi_ctx_class_ - /* Get pids of running jobs. So we can look for running shepherds. */ - npids = sge_get_pids(pids, 10000, SGE_SHEPHERD, PSCMD); - if (npids == -1) { -- ERROR((SGE_EVENT, MSG_SHEPHERD_CANTGETPROCESSESFROMPSCOMMAND)); -+ ERROR((SGE_EVENT, "%s", MSG_SHEPHERD_CANTGETPROCESSESFROMPSCOMMAND)); - DEXIT; - return -1; - } -@@ -1451,7 +1451,7 @@ examine_job_task_from_file(sge_gdi_ctx_c - - if (startup) - { -- INFO((SGE_EVENT, err_str)); -+ INFO((SGE_EVENT, "%s", err_str)); - modify_queue_limits_flag_for_job(ctx->get_qualified_hostname(ctx), jep, true); - } - else -diff -up GE2011.11p1/source/daemons/execd/setup_execd.c.format GE2011.11p1/source/daemons/execd/setup_execd.c ---- GE2011.11p1/source/daemons/execd/setup_execd.c.format 2012-05-23 13:04:38.000000000 -0600 -+++ GE2011.11p1/source/daemons/execd/setup_execd.c 2014-10-03 21:11:16.303851682 -0600 -@@ -88,20 +88,20 @@ void sge_setup_sge_execd(sge_gdi_ctx_cla - ** switch to admin user - */ - if (sge_set_admin_username(admin_user, err_str)) { -- CRITICAL((SGE_EVENT, err_str)); -+ CRITICAL((SGE_EVENT, "%s", err_str)); - /* TODO: remove */ - SGE_EXIT(NULL, 1); - } - - if (sge_switch2admin_user()) { -- CRITICAL((SGE_EVENT, MSG_ERROR_CANTSWITCHTOADMINUSER)); -+ CRITICAL((SGE_EVENT, "%s", MSG_ERROR_CANTSWITCHTOADMINUSER)); - /* TODO: remove */ - SGE_EXIT(NULL, 1); - } - - while (gdi2_wait_for_conf(ctx, &Execd_Config_List)) { - if (allowed_get_conf_errors-- <= 0) { -- CRITICAL((SGE_EVENT, MSG_EXECD_CANT_GET_CONFIGURATION_EXIT)); -+ CRITICAL((SGE_EVENT, "%s", MSG_EXECD_CANT_GET_CONFIGURATION_EXIT)); - /* TODO: remove */ - SGE_EXIT(NULL, 1); - } -diff -up GE2011.11p1/source/daemons/qmaster/configuration_qmaster.c.format GE2011.11p1/source/daemons/qmaster/configuration_qmaster.c ---- GE2011.11p1/source/daemons/qmaster/configuration_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/configuration_qmaster.c 2014-10-03 21:11:16.304851705 -0600 -@@ -167,7 +167,7 @@ int sge_read_configuration(sge_gdi_ctx_c - } - - if ((global = sge_get_configuration_for_host(SGE_GLOBAL_NAME)) == NULL) { -- ERROR((SGE_EVENT, MSG_CONFIG_NOGLOBAL)); -+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_NOGLOBAL)); - DRETURN(-1); - } - -@@ -371,7 +371,7 @@ int sge_mod_configuration(sge_gdi_ctx_cl - } - - if ((global = sge_get_configuration_for_host(SGE_GLOBAL_NAME)) == NULL) { -- ERROR((SGE_EVENT, MSG_CONFIG_NOGLOBAL)); -+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_NOGLOBAL)); - } - - if (merge_configuration(&answer_list, progid, cell_root, global, local, NULL) != 0) { -diff -up GE2011.11p1/source/daemons/qmaster/job_exit.c.format GE2011.11p1/source/daemons/qmaster/job_exit.c ---- GE2011.11p1/source/daemons/qmaster/job_exit.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/job_exit.c 2014-10-03 21:11:16.304851705 -0600 -@@ -326,7 +326,7 @@ void sge_job_exit(sge_gdi_ctx_class_t *c - - sge_dstring_sprintf(&error, MSG_LOG_QERRORBYJOBHOST_SUS, lGetString(qinstance, QU_qname), sge_u32c(jobid), host); - qinstance_message_add(qinstance, QI_ERROR, sge_dstring_get_string(&error)); -- ERROR((SGE_EVENT, sge_dstring_get_string(&error))); -+ ERROR((SGE_EVENT, "%s", sge_dstring_get_string(&error))); - sge_event_spool(ctx, &answer_list, 0, sgeE_QINSTANCE_MOD, - 0, 0, lGetString(qinstance, QU_qname), - lGetHost(qinstance, QU_qhostname), NULL, -@@ -350,7 +350,7 @@ void sge_job_exit(sge_gdi_ctx_class_t *c - /* general error -> this queue cant run any job */ - sge_qmaster_qinstance_state_set_error(queueep, true); - qinstance_message_add(queueep, QI_ERROR, sge_dstring_get_string(&error)); -- ERROR((SGE_EVENT, sge_dstring_get_string(&error))); -+ ERROR((SGE_EVENT, "%s", sge_dstring_get_string(&error))); - sge_event_spool(ctx, &answer_list, 0, sgeE_QINSTANCE_MOD, - 0, 0, lGetString(queueep, QU_qname), - lGetHost(queueep, QU_qhostname), NULL, -diff -up GE2011.11p1/source/daemons/qmaster/reschedule.c.format GE2011.11p1/source/daemons/qmaster/reschedule.c ---- GE2011.11p1/source/daemons/qmaster/reschedule.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/reschedule.c 2014-10-03 21:11:16.304851705 -0600 -@@ -333,10 +333,10 @@ int reschedule_job(sge_gdi_ctx_class_t * - if (job_is_array(jep)) { - sprintf(mail_ids, sge_U32CFormat"."sge_U32CFormat, - sge_u32c(job_number), sge_u32c(task_number)); -- sprintf(mail_type, MSG_RU_TYPEJOBARRAY); -+ sprintf(mail_type, "%s", MSG_RU_TYPEJOBARRAY); - } else { - sprintf(mail_ids, sge_U32CFormat, sge_u32c(job_number)); -- sprintf(mail_type, MSG_RU_TYPEJOB); -+ sprintf(mail_type, "%s", MSG_RU_TYPEJOB); - } - - granted_qs = lGetList(this_jatep, JAT_granted_destin_identifier_list); -@@ -531,9 +531,9 @@ int reschedule_job(sge_gdi_ctx_class_t * - - mail_options = lGetUlong(jep, JB_mail_options); - if (force) { -- sprintf(mail_action, MSG_RU_FORCEDR); -+ sprintf(mail_action, "%s", MSG_RU_FORCEDR); - } else { -- sprintf(mail_action, MSG_RU_PUSHEDR); -+ sprintf(mail_action, "%s", MSG_RU_PUSHEDR); - } - if (VALID(MAIL_AT_ABORT, mail_options)) { - lList *mail_users; -diff -up GE2011.11p1/source/daemons/qmaster/setup_qmaster.c.format GE2011.11p1/source/daemons/qmaster/setup_qmaster.c ---- GE2011.11p1/source/daemons/qmaster/setup_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/setup_qmaster.c 2014-10-03 21:11:16.305851728 -0600 -@@ -179,7 +179,7 @@ int sge_setup_qmaster(sge_gdi_ctx_class_ - - process_cmdline(anArgv); - -- INFO((SGE_EVENT, MSG_STARTUP_BEGINWITHSTARTUP)); -+ INFO((SGE_EVENT, "%s", MSG_STARTUP_BEGINWITHSTARTUP)); - - qmaster_unlock(QMASTER_LOCK_FILE); - -@@ -245,12 +245,12 @@ sge_qmaster_thread_init(sge_gdi_ctx_clas - if (switch_to_admin_user == true) { - char str[1024]; - if (sge_set_admin_username(admin_user, str) == -1) { -- CRITICAL((SGE_EVENT, str)); -+ CRITICAL((SGE_EVENT, "%s", str)); - SGE_EXIT((void**)ctx_ref, 1); - } - - if (sge_switch2admin_user()) { -- CRITICAL((SGE_EVENT, MSG_ERROR_CANTSWITCHTOADMINUSER)); -+ CRITICAL((SGE_EVENT, "%s", MSG_ERROR_CANTSWITCHTOADMINUSER)); - SGE_EXIT((void**)ctx_ref, 1); - } - } -@@ -520,7 +520,7 @@ static lList *parse_qmaster(lList **ppcm - } - - if(lGetNumberOfElem(*ppcmdline)) { -- sprintf(str, MSG_PARSE_TOOMANYOPTIONS); -+ sprintf(str, "%s", MSG_PARSE_TOOMANYOPTIONS); - if(!usageshowed) - sge_usage(QMASTER, stderr); - answer_list_add(&alp, str, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR); -@@ -557,7 +557,7 @@ static void qmaster_init(sge_gdi_ctx_cla - DENTER(TOP_LAYER, "qmaster_init"); - - if (setup_qmaster(ctx)) { -- CRITICAL((SGE_EVENT, MSG_STARTUP_SETUPFAILED)); -+ CRITICAL((SGE_EVENT, "%s", MSG_STARTUP_SETUPFAILED)); - SGE_EXIT(NULL, 1); - } - -@@ -809,7 +809,7 @@ static void qmaster_lock_and_shutdown(vo - - if (anExitValue == 0) { - if (qmaster_lock(QMASTER_LOCK_FILE) == -1) { -- CRITICAL((SGE_EVENT, MSG_QMASTER_LOCKFILE_ALREADY_EXISTS)); -+ CRITICAL((SGE_EVENT, "%s", MSG_QMASTER_LOCKFILE_ALREADY_EXISTS)); - } - } - sge_gdi2_shutdown(ctx_ref); -@@ -837,7 +837,7 @@ static int setup_qmaster(sge_gdi_ctx_cla - if (first) { - first = false; - } else { -- CRITICAL((SGE_EVENT, MSG_SETUP_SETUPMAYBECALLEDONLYATSTARTUP)); -+ CRITICAL((SGE_EVENT, "%s", MSG_SETUP_SETUPMAYBECALLEDONLYATSTARTUP)); - DEXIT; - return -1; - } -@@ -942,14 +942,14 @@ static int setup_qmaster(sge_gdi_ctx_cla - if (!host_list_locate(*object_base[SGE_TYPE_EXECHOST].list, SGE_TEMPLATE_NAME)) { - /* add an exec host "template" */ - if (sge_add_host_of_type(ctx, SGE_TEMPLATE_NAME, SGE_EH_LIST, &monitor)) -- ERROR((SGE_EVENT, MSG_CONFIG_ADDINGHOSTTEMPLATETOEXECHOSTLIST)); -+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_ADDINGHOSTTEMPLATETOEXECHOSTLIST)); - } - - /* add host "global" to Master_Exechost_List as an exec host */ - if (!host_list_locate(*object_base[SGE_TYPE_EXECHOST].list, SGE_GLOBAL_NAME)) { - /* add an exec host "global" */ - if (sge_add_host_of_type(ctx, SGE_GLOBAL_NAME, SGE_EH_LIST, &monitor)) -- ERROR((SGE_EVENT, MSG_CONFIG_ADDINGHOSTGLOBALTOEXECHOSTLIST)); -+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_ADDINGHOSTGLOBALTOEXECHOSTLIST)); - } - - /* add qmaster host to Master_Adminhost_List as an administrativ host */ -@@ -967,7 +967,7 @@ static int setup_qmaster(sge_gdi_ctx_cla - - if (!spool_write_object(&answer_list, spooling_context, ep, "root", SGE_TYPE_MANAGER, job_spooling)) { - answer_list_output(&answer_list); -- CRITICAL((SGE_EVENT, MSG_CONFIG_CANTWRITEMANAGERLIST)); -+ CRITICAL((SGE_EVENT, "%s", MSG_CONFIG_CANTWRITEMANAGERLIST)); - DRETURN(-1); - } - } -@@ -987,7 +987,7 @@ static int setup_qmaster(sge_gdi_ctx_cla - - if (!spool_write_object(&answer_list, spooling_context, ep, "root", SGE_TYPE_OPERATOR, job_spooling)) { - answer_list_output(&answer_list); -- CRITICAL((SGE_EVENT, MSG_CONFIG_CANTWRITEOPERATORLIST)); -+ CRITICAL((SGE_EVENT, "%s", MSG_CONFIG_CANTWRITEOPERATORLIST)); - DEXIT; - return -1; - } -diff -up GE2011.11p1/source/daemons/qmaster/sge_c_gdi.c.format GE2011.11p1/source/daemons/qmaster/sge_c_gdi.c ---- GE2011.11p1/source/daemons/qmaster/sge_c_gdi.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/sge_c_gdi.c 2014-10-03 21:11:16.306851752 -0600 -@@ -320,7 +320,7 @@ sge_c_gdi(sge_gdi_ctx_class_t *ctx, sge_ - sge_gdi_packet_pack_task(packet, task, answer_list, pb); - break; - default: -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_UNKNOWNOP)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_UNKNOWNOP)); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, - ANSWER_QUALITY_ERROR); - sge_gdi_packet_pack_task(packet, task, answer_list, pb); -@@ -357,7 +357,7 @@ sge_c_gdi_get(gdi_object_t *ao, sge_gdi_ - case SGE_EV_LIST: - task->data_list = sge_select_event_clients("", task->condition, task->enumeration); - task->do_select_pack_simultaneous = false; -- sprintf(SGE_EVENT, MSG_GDI_OKNL); -+ sprintf(SGE_EVENT, "%s", MSG_GDI_OKNL); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_END); - DEXIT; - return; -@@ -371,7 +371,7 @@ sge_c_gdi_get(gdi_object_t *ao, sge_gdi_ - - task->data_list = lSelectHashPack("", conf, task->condition, task->enumeration, false, NULL); - task->do_select_pack_simultaneous = false; -- sprintf(SGE_EVENT, MSG_GDI_OKNL); -+ sprintf(SGE_EVENT, "%s", MSG_GDI_OKNL); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_END); - lFreeList(&conf); - } -@@ -386,7 +386,7 @@ sge_c_gdi_get(gdi_object_t *ao, sge_gdi_ - conf = sconf_get_config_list(); - task->data_list = lSelectHashPack("", conf, task->condition, task->enumeration, false, NULL); - task->do_select_pack_simultaneous = false; -- sprintf(SGE_EVENT, MSG_GDI_OKNL); -+ sprintf(SGE_EVENT, "%s", MSG_GDI_OKNL); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_END); - lFreeList(&conf); - } -@@ -404,7 +404,7 @@ sge_c_gdi_get(gdi_object_t *ao, sge_gdi_ - answer_list_add(&(task->answer_list),MSG_SGETEXT_JOBINFOMESSAGESOUTDATED, - STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR); - } else if (ao == NULL || ao->list_type == SGE_TYPE_NONE) { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET)); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR); - } else { - lList *data_source = *object_type_get_master_list(ao->list_type); -@@ -420,7 +420,7 @@ sge_c_gdi_get(gdi_object_t *ao, sge_gdi_ - * 05/21/2007 qualitiy was ANSWER_QUALITY_INFO but this results in "ok" - * messages on qconf side - */ -- sprintf(SGE_EVENT, MSG_GDI_OKNL); -+ sprintf(SGE_EVENT, "%s", MSG_GDI_OKNL); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_END); - - } else { -@@ -567,7 +567,7 @@ sge_c_gdi_add(sge_gdi_ctx_class_t *ctx, - - default: - if (!ao) { -- SGE_ADD_MSG_ID( sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET)); -+ SGE_ADD_MSG_ID( sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET)); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR); - break; - } -@@ -656,7 +656,7 @@ sge_c_gdi_del(sge_gdi_ctx_class_t *ctx, - packet->user, packet->host); - break; - default: -- SGE_ADD_MSG_ID( sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET)); -+ SGE_ADD_MSG_ID( sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET)); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR); - break; - } -@@ -733,7 +733,7 @@ sge_c_gdi_del(sge_gdi_ctx_class_t *ctx, - ar_del(ctx, ep, &(task->answer_list), object_base[SGE_TYPE_AR].list, packet->user, packet->host, monitor); - break; - default: -- SGE_ADD_MSG_ID( sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET)); -+ SGE_ADD_MSG_ID( sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET)); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR); - break; - } /* switch target */ -@@ -788,7 +788,7 @@ static void sge_c_gdi_copy(sge_gdi_ctx_c - break; - - default: -- SGE_ADD_MSG_ID( sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET)); -+ SGE_ADD_MSG_ID( sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET)); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR); - break; - } -@@ -876,7 +876,7 @@ static void sge_gdi_do_permcheck(sge_gdi - } - } - -- sprintf(SGE_EVENT, MSG_GDI_OKNL); -+ sprintf(SGE_EVENT, "%s", MSG_GDI_OKNL); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_END); - DEXIT; - return; -@@ -895,7 +895,7 @@ sge_c_gdi_permcheck(sge_gdi_packet_class - sge_gdi_do_permcheck(packet, task); - break; - default: -- WARNING((SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET)); -+ WARNING((SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET)); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR); - } - DRETURN_VOID; -@@ -941,7 +941,7 @@ void sge_c_gdi_replace(sge_gdi_ctx_class - } - break; - default: -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET)); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR); - break; - } -@@ -1000,7 +1000,7 @@ sge_c_gdi_trigger(sge_gdi_ctx_class_t *c - default: - /* permissions should be checked in the functions. Here we don't - know what is to do, so we don't know what permissions we need */ -- WARNING((SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET)); -+ WARNING((SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET)); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR); - break; - } -@@ -1231,13 +1231,13 @@ trigger_scheduler_monitoring(sge_gdi_pac - DENTER(GDI_LAYER, "trigger_scheduler_monitoring"); - - if (!manop_is_manager(packet->user)) { -- WARNING((SGE_EVENT, MSG_COM_NOSCHEDMONPERMS)); -+ WARNING((SGE_EVENT, "%s", MSG_COM_NOSCHEDMONPERMS)); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_WARNING); - DEXIT; - return; - } - if (!sge_add_event_for_client(EV_ID_SCHEDD, 0, sgeE_SCHEDDMONITOR, 0, 0, NULL, NULL, NULL, NULL)) { -- WARNING((SGE_EVENT, MSG_COM_NOSCHEDDREGMASTER)); -+ WARNING((SGE_EVENT, "%s", MSG_COM_NOSCHEDDREGMASTER)); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_EEXIST, ANSWER_QUALITY_WARNING); - DEXIT; - return; -@@ -1311,7 +1311,7 @@ static void sge_c_gdi_mod(sge_gdi_ctx_cl - break; - default: - if (ao == NULL) { -- SGE_ADD_MSG_ID( sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET)); -+ SGE_ADD_MSG_ID( sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET)); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR); - break; - } -@@ -1422,7 +1422,7 @@ static int sge_chck_mod_perm_user(lList - } - break; - default: -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET)); - answer_list_add(alpp, SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR); - DRETURN(1); - } -@@ -1526,7 +1526,7 @@ int sge_chck_mod_perm_host(lList **alpp, - } - break; - default: -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET)); - answer_list_add(alpp, SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR); - DRETURN(1); - } -@@ -1595,7 +1595,7 @@ sge_task_check_get_perm_host(sge_gdi_pac - } - break; - default: -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET)); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR); - ret = false; - return ret; -@@ -1711,7 +1711,7 @@ monitoring_t *monitor - if (!(new_obj = (add - ? lCreateElem(object->type) - : lCopyElem(old_obj)))) { -- ERROR((SGE_EVENT, MSG_MEM_MALLOC)); -+ ERROR((SGE_EVENT, "%s", MSG_MEM_MALLOC)); - answer_list_add(alpp, SGE_EVENT, STATUS_EEXIST, ANSWER_QUALITY_ERROR); - DRETURN(STATUS_EEXIST); - } -diff -up GE2011.11p1/source/daemons/qmaster/sge_cqueue_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_cqueue_qmaster.c ---- GE2011.11p1/source/daemons/qmaster/sge_cqueue_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/sge_cqueue_qmaster.c 2014-10-03 21:11:16.306851752 -0600 -@@ -640,7 +640,7 @@ int cqueue_mod(sge_gdi_ctx_class_t *ctx, - const char *old_name = lGetString(cqueue, CQ_name); - - if (strcmp(old_name, name)) { -- ERROR((SGE_EVENT, MSG_CQUEUE_NONAMECHANGE)); -+ ERROR((SGE_EVENT, "%s", MSG_CQUEUE_NONAMECHANGE)); - answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, - ANSWER_QUALITY_ERROR); - ret = false; -@@ -932,7 +932,7 @@ int cqueue_del(sge_gdi_ctx_class_t *ctx, - */ - for_each(qinstance, qinstances) { - if (qinstance_slots_used(qinstance) > 0 || qinstance_slots_reserved(qinstance) > 0) { -- ERROR((SGE_EVENT, MSG_QINSTANCE_STILLJOBS)); -+ ERROR((SGE_EVENT, "%s", MSG_QINSTANCE_STILLJOBS)); - answer_list_add(answer_list, SGE_EVENT, STATUS_EEXIST, - ANSWER_QUALITY_ERROR); - do_del = false; -diff -up GE2011.11p1/source/daemons/qmaster/sge_follow.c.format GE2011.11p1/source/daemons/qmaster/sge_follow.c ---- GE2011.11p1/source/daemons/qmaster/sge_follow.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/sge_follow.c 2014-10-03 21:11:16.307851775 -0600 -@@ -196,7 +196,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct - - job_number=lGetUlong(ep, OR_job_number); - if (!job_number) { -- ERROR((SGE_EVENT, MSG_JOB_NOJOBID)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOJOBID)); - answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - DRETURN(-2); - } -@@ -305,7 +305,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct - * find and check queue - */ - if (!q_name) { -- ERROR((SGE_EVENT, MSG_OBJ_NOQNAME)); -+ ERROR((SGE_EVENT, "%s", MSG_OBJ_NOQNAME)); - answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - lFreeList(&gdil); - lSetString(jatp, JAT_granted_pe, NULL); -@@ -534,7 +534,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct - - job_number = lGetUlong(ep, OR_job_number); - if (job_number == 0) { -- ERROR((SGE_EVENT, MSG_JOB_NOJOBID)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOJOBID)); - answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - DRETURN(-2); - } -@@ -639,7 +639,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct - - job_number=lGetUlong(ep, OR_job_number); - if (!job_number) { -- ERROR((SGE_EVENT, MSG_JOB_NOJOBID)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOJOBID)); - answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - DRETURN(-2); - } -@@ -759,7 +759,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct - - job_number=lGetUlong(ep, OR_job_number); - if(!job_number) { -- ERROR((SGE_EVENT, MSG_JOB_NOJOBID)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOJOBID)); - answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - DEXIT; - return -2; -@@ -961,7 +961,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct - - job_number=lGetUlong(ep, OR_job_number); - if(!job_number) { -- ERROR((SGE_EVENT, MSG_JOB_NOJOBID)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOJOBID)); - answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - DEXIT; - return -2; -diff -up GE2011.11p1/source/daemons/qmaster/sge_hgroup_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_hgroup_qmaster.c ---- GE2011.11p1/source/daemons/qmaster/sge_hgroup_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/sge_hgroup_qmaster.c 2014-10-03 21:11:16.307851775 -0600 -@@ -256,7 +256,7 @@ hgroup_mod(sge_gdi_ctx_class_t *ctx, - } else { - lListElem *aep; - for_each(aep, *answer_list) { -- ERROR((SGE_EVENT, lGetString(aep, AN_text))); -+ ERROR((SGE_EVENT, "%s", lGetString(aep, AN_text))); - } - ret = false; - } -@@ -266,7 +266,7 @@ hgroup_mod(sge_gdi_ctx_class_t *ctx, - - /* Reject modify requests which try to change the groupname */ - if (sge_hostcmp(old_name, name)) { -- ERROR((SGE_EVENT, MSG_HGRP_NONAMECHANGE)); -+ ERROR((SGE_EVENT, "%s", MSG_HGRP_NONAMECHANGE)); - answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, - ANSWER_QUALITY_ERROR); - ret = false; -diff -up GE2011.11p1/source/daemons/qmaster/sge_host_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_host_qmaster.c ---- GE2011.11p1/source/daemons/qmaster/sge_host_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/sge_host_qmaster.c 2014-10-03 21:11:16.308851798 -0600 -@@ -392,7 +392,7 @@ int sge_del_host(sge_gdi_ctx_class_t *ct - } - else if (!strcasecmp(unique, "global")) - { -- ERROR((SGE_EVENT, MSG_OBJ_DELGLOBALHOST)); -+ ERROR((SGE_EVENT, "%s", MSG_OBJ_DELGLOBALHOST)); - answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR); - DEXIT; - return STATUS_ESEMANTIC; -@@ -1025,7 +1025,7 @@ void sge_gdi_kill_exechost(sge_gdi_ctx_c - DENTER(GDI_LAYER, "sge_gdi_kill_exechost"); - - if (!manop_is_manager(packet->user)) { -- ERROR((SGE_EVENT, MSG_OBJ_SHUTDOWNPERMS)); -+ ERROR((SGE_EVENT, "%s", MSG_OBJ_SHUTDOWNPERMS)); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOMGR, - ANSWER_QUALITY_ERROR); - DEXIT; -@@ -1074,7 +1074,7 @@ sge_gdi_ctx_class_t *ctx, sge_gdi_packet - if (lGetNumberOfElem(task->answer_list) == 0) { - /* no exechosts have been killed */ - DPRINTF((MSG_SGETEXT_NOEXECHOSTS)); -- INFO((SGE_EVENT, MSG_SGETEXT_NOEXECHOSTS)); -+ INFO((SGE_EVENT, "%s", MSG_SGETEXT_NOEXECHOSTS)); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_INFO); - } - } else { -diff -up GE2011.11p1/source/daemons/qmaster/sge_job_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_job_qmaster.c ---- GE2011.11p1/source/daemons/qmaster/sge_job_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/sge_job_qmaster.c 2014-10-03 21:11:16.309851822 -0600 -@@ -655,7 +655,7 @@ u_long32 step - DENTER(TOP_LAYER, "empty_job_list_filter"); - - if (all_users_flag) { -- ERROR((SGE_EVENT, MSG_SGETEXT_THEREARENOJOBS)); -+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_THEREARENOJOBS)); - } else if (user_list_flag) { - dstring user_list_string = DSTRING_INIT; - -@@ -716,7 +716,7 @@ u_long32 step - } - } else { - /* Should not be possible */ -- ERROR((SGE_EVENT, -+ ERROR((SGE_EVENT, "%s", - was_modify?MSG_SGETEXT_NOJOBSMODIFIED:MSG_SGETEXT_NOJOBSDELETED)); - } - -@@ -834,7 +834,7 @@ char *ruser - /* case 9 */ - - if (all_users_flag && user_list_flag) { -- ERROR((SGE_EVENT, MSG_SGETEXT_SPECIFYONEORALLUSER)); -+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_SPECIFYONEORALLUSER)); - answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - DRETURN(STATUS_EUNKNOWN); - } -@@ -2531,7 +2531,7 @@ int *trigger) - - /* reject PE ranges change requests for jobs without PE request */ - if (!(pe_name=lGetString(new_job, JB_pe))) { -- ERROR((SGE_EVENT, MSG_JOB_PERANGE_ONLY_FOR_PARALLEL)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_PERANGE_ONLY_FOR_PARALLEL)); - answer_list_add(alpp, SGE_EVENT, STATUS_EEXIST, ANSWER_QUALITY_ERROR); - DRETURN(STATUS_EUNKNOWN); - } -@@ -2875,7 +2875,7 @@ int job_verify_predecessors(lListElem *j - predecessors_req = lGetList(job, JB_jid_request_list); - predecessors_id = lCreateList("job_predecessors", JRE_Type); - if (!predecessors_id) { -- ERROR((SGE_EVENT, MSG_JOB_MOD_JOBDEPENDENCY_MEMORY )); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_MOD_JOBDEPENDENCY_MEMORY )); - answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - DRETURN(STATUS_EUNKNOWN); - } -@@ -2980,7 +2980,7 @@ int job_verify_predecessors_ad(lListElem - predecessors_req = lGetList(job, JB_ja_ad_request_list); - predecessors_id = lCreateList("job_predecessors_ad", JRE_Type); - if (!predecessors_id) { -- ERROR((SGE_EVENT, MSG_JOB_MOD_JOBDEPENDENCY_MEMORY )); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_MOD_JOBDEPENDENCY_MEMORY )); - answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - DRETURN(STATUS_EUNKNOWN); - } -@@ -2991,7 +2991,7 @@ int job_verify_predecessors_ad(lListElem - if (!job_is_array(job)) { - lFreeList(&predecessors_id); - DPRINTF(("could not create array dependence for non-array job\n")); -- ERROR((SGE_EVENT, MSG_JOB_MOD_CANONLYSPECIFYHOLDJIDADWITHADOPT)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_MOD_CANONLYSPECIFYHOLDJIDADWITHADOPT)); - answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - DRETURN(STATUS_EUNKNOWN); - } -@@ -3068,7 +3068,7 @@ int job_verify_predecessors_ad(lListElem - if (!job_is_array(pred_job)) { - lFreeList(&predecessors_id); - DPRINTF(("could not create array dependence on non-array job\n")); -- ERROR((SGE_EVENT, MSG_JOB_MOD_CANONLYSPECIFYHOLDJIDADWITHADOPT)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_MOD_CANONLYSPECIFYHOLDJIDADWITHADOPT)); - answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - DRETURN(STATUS_EUNKNOWN); - } -@@ -3076,7 +3076,7 @@ int job_verify_predecessors_ad(lListElem - if (!sge_task_depend_is_same_range(pred_job, job)) { - lFreeList(&predecessors_id); - DPRINTF(("could not create array dependence for jobs with different sub-task range\n")); -- ERROR((SGE_EVENT, MSG_JOB_MOD_ARRAYJOBMUSTHAVESAMERANGEWITHADOPT)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_MOD_ARRAYJOBMUSTHAVESAMERANGEWITHADOPT)); - answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - DRETURN(STATUS_EUNKNOWN); - } -@@ -3444,7 +3444,7 @@ int verify_suitable_queues(lList **alpp, - *trigger |= VERIFY_EVENT; - } - if (!a.pe) { -- sprintf(SGE_EVENT, MSG_JOB_VERIFYFOUNDQ); -+ sprintf(SGE_EVENT, "%s", MSG_JOB_VERIFYFOUNDQ); - } else { - sprintf(SGE_EVENT, MSG_JOB_VERIFYFOUNDSLOTS_I, a.slots); - } -@@ -4209,7 +4209,7 @@ job_verify_project(const lListElem *job, - * every job *must* request a project - */ - if (lGetNumberOfElem(projects) > 0) { -- ERROR((SGE_EVENT, MSG_JOB_PRJREQUIRED)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_PRJREQUIRED)); - answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - ret = STATUS_EUNKNOWN; - } -@@ -4218,7 +4218,7 @@ job_verify_project(const lListElem *job, - char* enforce_project = mconf_get_enforce_project(); - - if (enforce_project != NULL && strcasecmp(enforce_project, "true") == 0) { -- ERROR((SGE_EVENT, MSG_SGETEXT_NO_PROJECT)); -+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_NO_PROJECT)); - answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - ret = STATUS_EUNKNOWN; - } -diff -up GE2011.11p1/source/daemons/qmaster/sge_job_verify.c.format GE2011.11p1/source/daemons/qmaster/sge_job_verify.c ---- GE2011.11p1/source/daemons/qmaster/sge_job_verify.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/sge_job_verify.c 2014-10-03 21:11:16.309851822 -0600 -@@ -169,7 +169,7 @@ int sge_job_verify_adjust(sge_gdi_ctx_cl - if (ret == STATUS_OK) { - if ((!JOB_TYPE_IS_BINARY(lGetUlong(jep, JB_type)) && - !lGetString(jep, JB_script_ptr) && lGetString(jep, JB_script_file))) { -- ERROR((SGE_EVENT, MSG_JOB_NOSCRIPT)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOSCRIPT)); - answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - ret = STATUS_EUNKNOWN; - } -@@ -661,7 +661,7 @@ int sge_job_verify_adjust(sge_gdi_ctx_cl - */ - if (lGetUlong(jep, JB_priority) > BASE_PRIORITY && !manop_is_operator(ruser)) - { -- ERROR((SGE_EVENT, MSG_JOB_NONADMINPRIO)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_NONADMINPRIO)); - answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - DRETURN(STATUS_EUNKNOWN); - } -diff -up GE2011.11p1/source/daemons/qmaster/sge_pe_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_pe_qmaster.c ---- GE2011.11p1/source/daemons/qmaster/sge_pe_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/sge_pe_qmaster.c 2014-10-03 21:11:16.310851845 -0600 -@@ -212,7 +212,7 @@ int pe_mod(sge_gdi_ctx_class_t *ctx, lLi - /* -------- PE_resource_utilization */ - if (add) { - if (pe_set_slots_used(new_pe, 0)) { -- ERROR((SGE_EVENT, MSG_MEM_MALLOC)); -+ ERROR((SGE_EVENT, "%s", MSG_MEM_MALLOC)); - answer_list_add(alpp, SGE_EVENT, STATUS_EMALLOC, ANSWER_QUALITY_ERROR); - DEXIT; - return STATUS_EMALLOC; -diff -up GE2011.11p1/source/daemons/qmaster/sge_qmaster_heartbeat.c.format GE2011.11p1/source/daemons/qmaster/sge_qmaster_heartbeat.c ---- GE2011.11p1/source/daemons/qmaster/sge_qmaster_heartbeat.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/sge_qmaster_heartbeat.c 2014-10-03 21:11:16.310851845 -0600 -@@ -153,9 +153,9 @@ increment_heartbeat(sge_gdi_ctx_class_t - if ( getuniquehostname(act_qmaster_name, act_resolved_qmaster_name, 0) == CL_RETVAL_OK && - sge_hostcmp(act_resolved_qmaster_name, qualified_hostname) != 0 ) { - /* act_qmaster file has been changed */ -- WARNING((SGE_EVENT, MSG_HEART_ACT_QMASTER_FILE_CHANGED)); -+ WARNING((SGE_EVENT, "%s", MSG_HEART_ACT_QMASTER_FILE_CHANGED)); - if (sge_qmaster_shutdown_via_signal_thread(100) != 0) { -- ERROR((SGE_EVENT, MSG_HEART_CANT_SIGNAL)); -+ ERROR((SGE_EVENT, "%s", MSG_HEART_CANT_SIGNAL)); - /* TODO: here the ctx reference is not transported back - ** event_handler functions should use &ctx instead - */ -diff -up GE2011.11p1/source/daemons/qmaster/sge_qmaster_main.c.format GE2011.11p1/source/daemons/qmaster/sge_qmaster_main.c ---- GE2011.11p1/source/daemons/qmaster/sge_qmaster_main.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/sge_qmaster_main.c 2014-10-03 21:11:16.310851845 -0600 -@@ -327,7 +327,7 @@ int main(int argc, char* argv[]) - max_enroll_tries--; - if (max_enroll_tries <= 0) { - /* exit after 30 seconds */ -- CRITICAL((SGE_EVENT, MSG_QMASTER_COMMUNICATION_ERRORS )); -+ CRITICAL((SGE_EVENT, "%s", MSG_QMASTER_COMMUNICATION_ERRORS )); - SGE_EXIT((void**)&ctx, 1); - } - if (cl_com_get_handle(prognames[QMASTER],1) == NULL) { -@@ -343,7 +343,7 @@ int main(int argc, char* argv[]) - */ - ret_val = cl_com_set_status_func(sge_qmaster_application_status); - if (ret_val != CL_RETVAL_OK) { -- ERROR((SGE_EVENT, cl_get_error_text(ret_val))); -+ ERROR((SGE_EVENT, "%s", cl_get_error_text(ret_val))); - } - - /* -diff -up GE2011.11p1/source/daemons/qmaster/sge_qmaster_process_message.c.format GE2011.11p1/source/daemons/qmaster/sge_qmaster_process_message.c ---- GE2011.11p1/source/daemons/qmaster/sge_qmaster_process_message.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/sge_qmaster_process_message.c 2014-10-03 21:11:16.311851868 -0600 -@@ -321,7 +321,7 @@ do_report_request(sge_gdi_ctx_class_t *c - } - - if (cull_unpack_list(&(aMsg->buf), &rep)) { -- ERROR((SGE_EVENT,MSG_CULL_FAILEDINCULLUNPACKLISTREPORT)); -+ ERROR((SGE_EVENT, "%s", MSG_CULL_FAILEDINCULLUNPACKLISTREPORT)); - DRETURN_VOID; - } - -@@ -571,7 +571,7 @@ static void sge_c_job_ack(sge_gdi_ctx_cl - } - - default: -- ERROR((SGE_EVENT, MSG_COM_ACK_UNKNOWN)); -+ ERROR((SGE_EVENT, "%s", MSG_COM_ACK_UNKNOWN)); - } - DRETURN_VOID; - } -diff -up GE2011.11p1/source/daemons/qmaster/sge_qmaster_threads.c.format GE2011.11p1/source/daemons/qmaster/sge_qmaster_threads.c ---- GE2011.11p1/source/daemons/qmaster/sge_qmaster_threads.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/sge_qmaster_threads.c 2014-10-03 21:11:16.311851868 -0600 -@@ -104,7 +104,7 @@ void sge_gdi_kill_master(sge_gdi_packet_ - - if (sge_gdi_packet_parse_auth_info(packet, &(task->answer_list), &uid, username, sizeof(username), - &gid, groupname, sizeof(groupname)) == -1) { -- ERROR((SGE_EVENT, MSG_GDI_FAILEDTOEXTRACTAUTHINFO)); -+ ERROR((SGE_EVENT, "%s", MSG_GDI_FAILEDTOEXTRACTAUTHINFO)); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR); - DEXIT; - return; -@@ -113,7 +113,7 @@ void sge_gdi_kill_master(sge_gdi_packet_ - DPRINTF(("uid/username = %d/%s, gid/groupname = %d/%s\n", (int) uid, username, (int) gid, groupname)); - - if (!manop_is_manager(username)) { -- ERROR((SGE_EVENT, MSG_SHUTDOWN_SHUTTINGDOWNQMASTERREQUIRESMANAGERPRIVILEGES)); -+ ERROR((SGE_EVENT, "%s", MSG_SHUTDOWN_SHUTTINGDOWNQMASTERREQUIRESMANAGERPRIVILEGES)); - answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR); - DEXIT; - return; -@@ -249,12 +249,12 @@ void sge_become_admin_user(const char *a - DENTER(TOP_LAYER, "sge_become_admin_user"); - - if (sge_set_admin_username(admin_user, str) == -1) { -- CRITICAL((SGE_EVENT, str)); -+ CRITICAL((SGE_EVENT, "%s", str)); - SGE_EXIT(NULL, 1); - } - - if (sge_switch2admin_user()) { -- CRITICAL((SGE_EVENT, MSG_ERROR_CANTSWITCHTOADMINUSER)); -+ CRITICAL((SGE_EVENT, "%s", MSG_ERROR_CANTSWITCHTOADMINUSER)); - SGE_EXIT(NULL, 1); - } - -diff -up GE2011.11p1/source/daemons/qmaster/sge_qmod_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_qmod_qmaster.c ---- GE2011.11p1/source/daemons/qmaster/sge_qmod_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/sge_qmod_qmaster.c 2014-10-03 21:11:16.311851868 -0600 -@@ -656,7 +656,7 @@ monitoring_t *monitor - DPRINTF(("cleaning queue >%s<\n", qname )); - - if (!manop_is_manager(user)) { -- ERROR((SGE_EVENT, MSG_QUEUE_NOCLEANQPERMS)); -+ ERROR((SGE_EVENT, "%s", MSG_QUEUE_NOCLEANQPERMS)); - answer_list_add(answer, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR); - DEXIT; - return -1; -diff -up GE2011.11p1/source/daemons/qmaster/sge_resource_quota_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_resource_quota_qmaster.c ---- GE2011.11p1/source/daemons/qmaster/sge_resource_quota_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/sge_resource_quota_qmaster.c 2014-10-03 21:11:16.312851892 -0600 -@@ -168,7 +168,7 @@ int rqs_mod(sge_gdi_ctx_class_t *ctx, - attr_mod_sub_list(alpp, new_rule, RQR_limit, RQRL_name, rule, - sub_command, SGE_ATTR_RQSRULES, SGE_OBJ_RQS, 0); - } else { -- ERROR((SGE_EVENT, MSG_RESOURCEQUOTA_NORULEDEFINED)); -+ ERROR((SGE_EVENT, "%s", MSG_RESOURCEQUOTA_NORULEDEFINED)); - answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, - ANSWER_QUALITY_ERROR); - goto ERROR; -diff -up GE2011.11p1/source/daemons/qmaster/sge_sched_prepare_data.c.format GE2011.11p1/source/daemons/qmaster/sge_sched_prepare_data.c ---- GE2011.11p1/source/daemons/qmaster/sge_sched_prepare_data.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/sge_sched_prepare_data.c 2014-10-03 21:11:16.312851892 -0600 -@@ -399,7 +399,7 @@ ensure_valid_what_and_where(sge_where_wh - where_what->what_queue == NULL || where_what->where_queue2 == NULL || - where_what->what_queue2 == NULL || where_what->where_all_queue == NULL || - where_what->what_pe == NULL) { -- CRITICAL((SGE_EVENT, MSG_SCHEDD_UNABLE_TO_SETUP_FILTER)); -+ CRITICAL((SGE_EVENT, "%s", MSG_SCHEDD_UNABLE_TO_SETUP_FILTER)); - } - /* cleanup tmp data */ - if (tmp_what_descr != NULL) -diff -up GE2011.11p1/source/daemons/qmaster/sge_userset_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_userset_qmaster.c ---- GE2011.11p1/source/daemons/qmaster/sge_userset_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/sge_userset_qmaster.c 2014-10-03 21:11:16.313851915 -0600 -@@ -287,13 +287,13 @@ static int dept_is_valid_defaultdepartme - if (dept != NULL) { - /* test 'type' */ - if (!(lGetUlong(dept, US_type) & US_DEPT)) { -- ERROR((SGE_EVENT, MSG_QMASTER_DEPTFORDEFDEPARTMENT)); -+ ERROR((SGE_EVENT, "%s", MSG_QMASTER_DEPTFORDEFDEPARTMENT)); - answer_list_add(answer_list, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR); - ret = 0; - } - /* test user list */ - if (lGetNumberOfElem(lGetList(dept, US_entries)) > 0 ) { -- ERROR((SGE_EVENT, MSG_QMASTER_AUTODEFDEPARTMENT)); -+ ERROR((SGE_EVENT, "%s", MSG_QMASTER_AUTODEFDEPARTMENT)); - answer_list_add(answer_list, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR); - ret = 0; - } -@@ -327,12 +327,12 @@ static int acl_is_valid_acl(lListElem *a - if (acl != NULL) { - if (!(lGetUlong(acl, US_type) & US_DEPT)) { - if (lGetUlong(acl, US_fshare) > 0) { -- ERROR((SGE_EVENT, MSG_QMASTER_ACLNOSHARE)); -+ ERROR((SGE_EVENT, "%s", MSG_QMASTER_ACLNOSHARE)); - answer_list_add(answer_list, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR); - ret = 0; - } - if (lGetUlong(acl, US_oticket) > 0) { -- ERROR((SGE_EVENT, MSG_QMASTER_ACLNOTICKET)); -+ ERROR((SGE_EVENT, "%s", MSG_QMASTER_ACLNOTICKET)); - answer_list_add(answer_list, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR); - ret = 0; - } -diff -up GE2011.11p1/source/daemons/qmaster/sge_utility_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_utility_qmaster.c ---- GE2011.11p1/source/daemons/qmaster/sge_utility_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/daemons/qmaster/sge_utility_qmaster.c 2014-10-03 21:11:16.313851915 -0600 -@@ -547,7 +547,7 @@ bool attr_mod_sub_list(lList **alpp, lLi - } - - if (rstring == NULL || fstring == NULL) { -- ERROR((SGE_EVENT, MSG_OBJECT_VALUEMISSING)); -+ ERROR((SGE_EVENT, "%s", MSG_OBJECT_VALUEMISSING)); - answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, - ANSWER_QUALITY_ERROR); - ret = false; -@@ -618,7 +618,7 @@ bool attr_mod_sub_list(lList **alpp, lLi - } - - if (rstring == NULL) { -- ERROR((SGE_EVENT, MSG_OBJECT_VALUEMISSING)); -+ ERROR((SGE_EVENT, "%s", MSG_OBJECT_VALUEMISSING)); - answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, - ANSWER_QUALITY_ERROR); - ret = false; -diff -up GE2011.11p1/source/daemons/shadowd/shadowd.c.format GE2011.11p1/source/daemons/shadowd/shadowd.c ---- GE2011.11p1/source/daemons/shadowd/shadowd.c.format 2012-05-23 13:04:38.000000000 -0600 -+++ GE2011.11p1/source/daemons/shadowd/shadowd.c 2014-10-03 21:11:16.313851915 -0600 -@@ -125,7 +125,7 @@ static int shadowd_is_old_master_enrolle - - handle=cl_com_create_handle(&commlib_error, CL_CT_TCP, CL_CM_CT_MESSAGE, CL_FALSE, sge_qmaster_port, CL_TCP_DEFAULT,(char*)prognames[SHADOWD] , 0, 1,0 ); - if (handle == NULL) { -- CRITICAL((SGE_EVENT,cl_get_error_text(commlib_error))); -+ CRITICAL((SGE_EVENT, "%s", cl_get_error_text(commlib_error))); - DRETURN(is_up_and_running); - } - -@@ -284,12 +284,12 @@ char qmaster_out_file[SGE_PATH_MAX]; - } - - if (sge_set_admin_username(ctx->get_admin_user(ctx), err_str)) { -- CRITICAL((SGE_EVENT, err_str)); -+ CRITICAL((SGE_EVENT, "%s", err_str)); - SGE_EXIT((void**)&ctx, 1); - } - - if (sge_switch2admin_user()) { -- CRITICAL((SGE_EVENT, MSG_SHADOWD_CANTSWITCHTOADMIN_USER)); -+ CRITICAL((SGE_EVENT, "%s", MSG_SHADOWD_CANTSWITCHTOADMIN_USER)); - SGE_EXIT((void**)&ctx, 1); - } - -@@ -365,7 +365,7 @@ char qmaster_out_file[SGE_PATH_MAX]; - if (ret == 0) { - /* we can start a qmaster on this host */ - if (qmaster_lock(QMASTER_LOCK_FILE)) { -- ERROR((SGE_EVENT, MSG_SHADOWD_FAILEDTOLOCKQMASTERSOMBODYWASFASTER)); -+ ERROR((SGE_EVENT, "%s", MSG_SHADOWD_FAILEDTOLOCKQMASTERSOMBODYWASFASTER)); - } else { - int out, err; - -@@ -402,7 +402,7 @@ char qmaster_out_file[SGE_PATH_MAX]; - ret = startprog(out, err, NULL, binpath, qmaster_name, NULL); - sge_switch2admin_user(); - if (ret) { -- ERROR((SGE_EVENT, MSG_SHADOWD_CANTSTARTQMASTER)); -+ ERROR((SGE_EVENT, "%s", MSG_SHADOWD_CANTSTARTQMASTER)); - } - close(out); - } else { -@@ -533,7 +533,7 @@ static int check_if_valid_shadow(char *b - DRETURN(-1); - } - -- sprintf(binpath, binary_path); /* copy global configuration path */ -+ sprintf(binpath, "%s", binary_path); /* copy global configuration path */ - DPRINTF((""SFQ"\n", binpath)); - DPRINTF(("we are a candidate for shadow master\n")); - -diff -up GE2011.11p1/source/libs/comm/cl_communication.c.format GE2011.11p1/source/libs/comm/cl_communication.c ---- GE2011.11p1/source/libs/comm/cl_communication.c.format 2012-05-23 13:04:40.000000000 -0600 -+++ GE2011.11p1/source/libs/comm/cl_communication.c 2014-10-03 21:11:16.315851962 -0600 -@@ -3728,7 +3728,7 @@ int cl_com_connection_complete_request(c - if ( cm_message->dst->comp_host != NULL ) { - snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_CANT_RESOLVE_DESTINATION_HOST_S, cm_message->dst->comp_host ); - } else { -- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_EMPTY_DESTINATION_HOST ); -+ snprintf(tmp_buffer, 256, "%s", MSG_CL_TCP_FW_EMPTY_DESTINATION_HOST ); - } - cl_commlib_push_application_error(CL_LOG_ERROR, retval , tmp_buffer ); - unique_host = strdup("(HOST_NOT_RESOLVABLE)"); -@@ -3745,7 +3745,7 @@ int cl_com_connection_complete_request(c - if ( cm_message->dst->comp_host != NULL && unique_host != NULL ) { - snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_REMOTE_DESTINATION_HOSTNAME_X_NOT_Y_SS, cm_message->dst->comp_host, unique_host); - } else { -- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_EMPTY_DESTINATION_HOST ); -+ snprintf(tmp_buffer, 256, "%s", MSG_CL_TCP_FW_EMPTY_DESTINATION_HOST ); - } - cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_LOCAL_HOSTNAME_ERROR, tmp_buffer ); - -@@ -3789,7 +3789,7 @@ int cl_com_connection_complete_request(c - if (cm_message->rdata->comp_host != NULL) { - snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_CANT_RESOLVE_RDATA_HOST_S , cm_message->rdata->comp_host); - } else { -- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_EMPTY_RDATA_HOST); -+ snprintf(tmp_buffer, 256, "%s", MSG_CL_TCP_FW_EMPTY_RDATA_HOST); - } - cl_commlib_push_application_error(CL_LOG_ERROR, retval , tmp_buffer ); - unique_host = strdup("(HOST_NOT_RESOLVABLE)"); -@@ -3810,7 +3810,7 @@ int cl_com_connection_complete_request(c - if ( cm_message->rdata->comp_host != NULL && unique_host != NULL ) { - snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_REMOTE_RDATA_HOSTNAME_X_NOT_Y_SS, cm_message->rdata->comp_host, unique_host); - } else { -- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_EMPTY_RDATA_HOST ); -+ snprintf(tmp_buffer, 256, "%s", MSG_CL_TCP_FW_EMPTY_RDATA_HOST ); - } - cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_LOCAL_HOSTNAME_ERROR, tmp_buffer ); - -@@ -3949,9 +3949,9 @@ int cl_com_connection_complete_request(c - snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_IP_ADDRESS_RESOLVING_X_NOT_Y_SS, connection->client_host_name, connection->remote->comp_host ); - } else { - if (connection->client_host_name == NULL) { -- snprintf(tmp_buffer,256, MSG_CL_TCP_FW_CANT_RESOLVE_CLIENT_IP ); -+ snprintf(tmp_buffer,256, "%s", MSG_CL_TCP_FW_CANT_RESOLVE_CLIENT_IP ); - } else { -- snprintf(tmp_buffer,256, MSG_CL_TCP_FW_EMPTY_REMOTE_HOST ); -+ snprintf(tmp_buffer,256, "%s", MSG_CL_TCP_FW_EMPTY_REMOTE_HOST ); - } - } - cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_LOCAL_HOSTNAME_ERROR, tmp_buffer ); -diff -up GE2011.11p1/source/libs/comm/cl_ssl_framework.c.format GE2011.11p1/source/libs/comm/cl_ssl_framework.c ---- GE2011.11p1/source/libs/comm/cl_ssl_framework.c.format 2012-05-23 13:04:40.000000000 -0600 -+++ GE2011.11p1/source/libs/comm/cl_ssl_framework.c 2014-10-03 21:11:16.512856557 -0600 -@@ -1071,9 +1071,9 @@ static int cl_com_ssl_build_symbol_table - - #elif defined(FREEBSD) - #ifdef RTLD_NODELETE -- cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_GLOBAL | RTLD_NODELETE); -+ cl_com_ssl_crypto_handle = dlopen ("libssl.so.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10", RTLD_LAZY | RTLD_GLOBAL | RTLD_NODELETE); - #else -- cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_GLOBAL); -+ cl_com_ssl_crypto_handle = dlopen ("libssl.so.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10", RTLD_LAZY | RTLD_GLOBAL); - #endif /* RTLD_NODELETE */ - - #elif defined(HPUX) -@@ -1085,9 +1085,9 @@ static int cl_com_ssl_build_symbol_table - - #else - #ifdef RTLD_NODELETE -- cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_NODELETE); -+ cl_com_ssl_crypto_handle = dlopen ("libssl.so.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10", RTLD_LAZY | RTLD_NODELETE); - #else -- cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY); -+ cl_com_ssl_crypto_handle = dlopen ("libssl.so.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10", RTLD_LAZY); - #endif /* RTLD_NODELETE */ - #endif - -@@ -2020,7 +2020,7 @@ static int cl_com_ssl_transform_ssl_erro - if (buffer_copy == NULL) { - return CL_RETVAL_MALLOC; - } -- snprintf(buffer_copy, buflen, buffer); -+ snprintf(buffer_copy, buflen, "%s", buffer); - - help = strtok_r(buffer_copy, ":", &lasts); - if (help != NULL) { -@@ -2066,7 +2066,7 @@ static int cl_com_ssl_transform_ssl_erro - free(module); - return CL_RETVAL_MALLOC; - } -- snprintf(error_text, buflen, buffer); -+ snprintf(error_text, buflen, "%s", buffer); - } - - -@@ -2153,11 +2153,11 @@ static int cl_com_ssl_log_ssl_errors(con - ret_val = cl_com_ssl_transform_ssl_error(ssl_error,buffer,512, &transformed_ssl_error); - - if (transformed_ssl_error != NULL) { -- snprintf(help_buf, 1024, transformed_ssl_error); -+ snprintf(help_buf, 1024, "%s", transformed_ssl_error); - free(transformed_ssl_error); - transformed_ssl_error = NULL; - } else { -- snprintf(help_buf, 1024, buffer); -+ snprintf(help_buf, 1024, "%s", buffer); - } - - if (ret_val != CL_RETVAL_DO_IGNORE) { -@@ -3087,7 +3087,7 @@ int cl_com_ssl_connection_complete_accep - if (connection->client_host_name != NULL) { - snprintf(tmp_buffer,1024, MSG_CL_COMMLIB_SSL_ACCEPT_TIMEOUT_ERROR_S, connection->client_host_name); - } else { -- snprintf(tmp_buffer,1024, MSG_CL_COMMLIB_SSL_ACCEPT_TIMEOUT_ERROR); -+ snprintf(tmp_buffer,1024, "%s", MSG_CL_COMMLIB_SSL_ACCEPT_TIMEOUT_ERROR); - } - - cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_SSL_ACCEPT_HANDSHAKE_TIMEOUT, tmp_buffer); -@@ -3102,7 +3102,7 @@ int cl_com_ssl_connection_complete_accep - if (connection->client_host_name != NULL) { - snprintf(tmp_buffer,1024, MSG_CL_COMMLIB_SSL_ACCEPT_ERROR_S, connection->client_host_name); - } else { -- snprintf(tmp_buffer,1024, MSG_CL_COMMLIB_SSL_ACCEPT_ERROR); -+ snprintf(tmp_buffer,1024, "%s", MSG_CL_COMMLIB_SSL_ACCEPT_ERROR); - } - - cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_SSL_ACCEPT_ERROR, tmp_buffer); -diff -up GE2011.11p1/source/libs/cull/cull_file.c.format GE2011.11p1/source/libs/cull/cull_file.c ---- GE2011.11p1/source/libs/cull/cull_file.c.format 2012-05-23 13:04:41.000000000 -0600 -+++ GE2011.11p1/source/libs/cull/cull_file.c 2014-10-03 21:11:16.317852008 -0600 -@@ -91,7 +91,7 @@ int lWriteElemToDisk(const lListElem *ep - - if (!prefix && !name) - { -- ERROR((SGE_EVENT, MSG_CULL_NOPREFIXANDNOFILENAMEINWRITEELMTODISK )); -+ ERROR((SGE_EVENT, "%s", MSG_CULL_NOPREFIXANDNOFILENAMEINWRITEELMTODISK )); - DEXIT; - return 1; - } -@@ -210,7 +210,7 @@ lListElem *lReadElemFromDisk(const char - - if (!prefix && !name) - { -- ERROR((SGE_EVENT, MSG_CULL_NOPREFIXANDNOFILENAMEINREADELEMFROMDISK )); -+ ERROR((SGE_EVENT, "%s", MSG_CULL_NOPREFIXANDNOFILENAMEINREADELEMFROMDISK )); - DEXIT; - return NULL; - } -@@ -242,7 +242,7 @@ lListElem *lReadElemFromDisk(const char - size = statbuf.st_size; - if (((SGE_OFF_T)size != statbuf.st_size) || !(buf = malloc(statbuf.st_size))) - { -- CRITICAL((SGE_EVENT, MSG_CULL_LEMALLOC)); -+ CRITICAL((SGE_EVENT, "%s", MSG_CULL_LEMALLOC)); - DEXIT; - return NULL; - } -diff -up GE2011.11p1/source/libs/cull/cull_multitype.c.format GE2011.11p1/source/libs/cull/cull_multitype.c ---- GE2011.11p1/source/libs/cull/cull_multitype.c.format 2012-05-23 13:04:41.000000000 -0600 -+++ GE2011.11p1/source/libs/cull/cull_multitype.c 2014-10-03 21:11:16.318852032 -0600 -@@ -102,8 +102,8 @@ int incompatibleType2(const char *fmt,.. - vsprintf(buf, fmt, ap); - va_end(ap); - -- CRITICAL((SGE_EVENT, buf)); -- fprintf(stderr, buf); -+ CRITICAL((SGE_EVENT, "%s", buf)); -+ fprintf(stderr, "%s", buf); - - abort(); - DEXIT; -@@ -751,7 +751,7 @@ lUlong lGetPosUlong(const lListElem *ep, - if (pos < 0) { - /* someone has called lGetPosUlong() */ - /* makro with an invalid nm */ -- CRITICAL((SGE_EVENT, MSG_CULL_GETPOSULONG_GOTINVALIDPOSITION )); -+ CRITICAL((SGE_EVENT, "%s", MSG_CULL_GETPOSULONG_GOTINVALIDPOSITION )); - DEXIT; - abort(); - } -@@ -994,7 +994,7 @@ lListElem *lGetPosObject(const lListElem - if (pos < 0) { - /* someone has called lGetPosUlong() */ - /* makro with an invalid nm */ -- CRITICAL((SGE_EVENT, MSG_CULL_GETPOSOBJECT_GOTANINVALIDPOS )); -+ CRITICAL((SGE_EVENT, "%s", MSG_CULL_GETPOSOBJECT_GOTANINVALIDPOS )); - DEXIT; - abort(); - } -@@ -1031,7 +1031,7 @@ lList *lGetPosList(const lListElem *ep, - if (pos < 0) { - /* someone has called lGetPosUlong() */ - /* makro with an invalid nm */ -- CRITICAL((SGE_EVENT, MSG_CULL_GETPOSLIST_GOTANINVALIDPOS )); -+ CRITICAL((SGE_EVENT, "%s", MSG_CULL_GETPOSLIST_GOTANINVALIDPOS )); - DEXIT; - abort(); - } -diff -up GE2011.11p1/source/libs/evc/sge_event_client.c.format GE2011.11p1/source/libs/evc/sge_event_client.c ---- GE2011.11p1/source/libs/evc/sge_event_client.c.format 2012-05-23 13:04:44.000000000 -0600 -+++ GE2011.11p1/source/libs/evc/sge_event_client.c 2014-10-03 21:11:16.320852078 -0600 -@@ -1085,7 +1085,7 @@ static int ec2_set_edtime(sge_evc_class_ - DENTER(EVC_LAYER, "ec2_set_edtime"); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else { - ret = (lGetUlong(sge_evc->ec, EV_d_time) != interval); - if (ret > 0) { -@@ -1124,7 +1124,7 @@ static int ec2_get_edtime(sge_evc_class_ - DENTER(EVC_LAYER, "ec2_get_edtime"); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else { - interval = lGetUlong(sge_evc->ec, EV_d_time); - } -@@ -1166,7 +1166,7 @@ static bool ec2_set_flush_delay(sge_evc_ - DENTER(EVC_LAYER, "ec2_set_flush_delay"); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else { - ret = (lGetUlong(sge_evc->ec, EV_flush_delay) != flush_delay) ? true : false; - -@@ -1207,7 +1207,7 @@ static int ec2_get_flush_delay(sge_evc_c - DENTER(EVC_LAYER, "ec2_get_flush_delay"); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else { - flush_delay = lGetUlong(sge_evc->ec, EV_flush_delay); - } -@@ -1256,7 +1256,7 @@ static bool ec2_set_busy_handling(sge_ev - DENTER(EVC_LAYER, "ec2_set_busy_handling"); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else { - DPRINTF(("EVC: change event client to "sge_U32CFormat"\n", (u_long32)handling)); - -@@ -1299,7 +1299,7 @@ static ev_busy_handling ec2_get_busy_han - DENTER(EVC_LAYER, "ec2_get_busy_handling"); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else { - handling = (ev_busy_handling)lGetUlong(sge_evc->ec, EV_busy_handling); - } -@@ -1318,7 +1318,7 @@ static bool ec2_deregister_local(sge_evc - - /* not yet initialized? Nothing to shutdown */ - if (sge_evc == NULL || sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else { - local_t *evc_local = &(thiz->ec_local); - u_long32 id = sge_evc->ec_reg_id; -@@ -1390,7 +1390,7 @@ ec2_register_local(sge_evc_class_t *thiz - DPRINTF(("trying to register as internal client with preset %d (0 means EV_ID_ANY)\n", (int)sge_evc->ec_reg_id)); - - if (sge_evc->ec == NULL) { -- WARNING((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ WARNING((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - ret = false; - } else { - lList *alp = NULL; -@@ -1493,7 +1493,7 @@ static bool ec2_register(sge_evc_class_t - PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT); - - if (sge_evc->ec == NULL) { -- WARNING((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ WARNING((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else { - lList *lp, *alp; - lListElem *aep; -@@ -1728,7 +1728,7 @@ static bool ec2_subscribe(sge_evc_class_ - PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) { - WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event)); - } else { -@@ -1758,7 +1758,7 @@ static void ec2_add_subscriptionElement( - DENTER(EVC_LAYER, "ec2_add_subscriptionElement"); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) { - WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event)); - } else { -@@ -1796,7 +1796,7 @@ static void ec2_mod_subscription_flush(s - DENTER(EVC_LAYER, "ec2_mod_subscription_flush"); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) { - WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event)); - } else { -@@ -1851,7 +1851,7 @@ static bool ec2_mod_subscription_where(s - DENTER(EVC_LAYER, "ec2_mod_subscription_where"); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else if (event <= sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) { - WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event)); - } else { -@@ -1882,7 +1882,7 @@ static void ec2_remove_subscriptionEleme - DENTER(EVC_LAYER, "ec2_remove_subscriptionElement"); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) { - WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event)); - } else { -@@ -1981,7 +1981,7 @@ static bool ec2_unsubscribe(sge_evc_clas - PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) { - WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event )); - } else { -@@ -1996,7 +1996,7 @@ static bool ec2_unsubscribe(sge_evc_clas - - } else { - if (event == sgeE_QMASTER_GOES_DOWN || event == sgeE_SHUTDOWN || event == sgeE_ACK_TIMEOUT) { -- ERROR((SGE_EVENT, MSG_EVENT_HAVETOHANDLEEVENTS)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_HAVETOHANDLEEVENTS)); - } else { - ec2_remove_subscriptionElement(thiz, event); - } -@@ -2083,14 +2083,14 @@ static int ec2_get_flush(sge_evc_class_t - PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) { - WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event )); - } else { - lListElem *sub_event = lGetElemUlong(lGetList(sge_evc->ec, EV_subscribed), EVS_id, event); - - if (sub_event == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else if (lGetBool(sub_event, EVS_flush)) { - ret = lGetUlong(sub_event, EVS_interval); - } -@@ -2144,7 +2144,7 @@ static bool ec2_set_flush(sge_evc_class_ - PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) { - WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event )); - } else { -@@ -2159,7 +2159,7 @@ static bool ec2_set_flush(sge_evc_class_ - lListElem *sub_event = lGetElemUlong(lGetList(sge_evc->ec, EV_subscribed), EVS_id, event); - - if (sub_event == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } - else { - ec2_mod_subscription_flush(thiz, event, EV_FLUSHED, interval); -@@ -2212,14 +2212,14 @@ static bool ec2_unset_flush(sge_evc_clas - PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) { - WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event)); - } else { - lListElem *sub_event = lGetElemUlong(lGetList(sge_evc->ec, EV_subscribed), EVS_id, event); - - if (sub_event == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } - else { - ec2_mod_subscription_flush(thiz, event, EV_NOT_FLUSHED, EV_NO_FLUSH); -@@ -2318,7 +2318,7 @@ static bool ec2_set_busy(sge_evc_class_t - DENTER(EVC_LAYER, "ec2_set_busy"); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else { - lSetUlong(sge_evc->ec, EV_busy, busy); - ret = true; -@@ -2360,7 +2360,7 @@ static bool ec2_get_busy(sge_evc_class_t - DENTER(EVC_LAYER, "ec2_get_busy"); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else { - /* JG: TODO: EV_busy should be boolean datatype */ - ret = (lGetUlong(sge_evc->ec, EV_busy) > 0) ? true : false; -@@ -2398,7 +2398,7 @@ static bool ec2_set_session(sge_evc_clas - DENTER(EVC_LAYER, "ec2_set_session"); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else { - lSetString(sge_evc->ec, EV_session, session); - -@@ -2436,7 +2436,7 @@ static const char *ec2_get_session(sge_e - DENTER(EVC_LAYER, "ec2_get_session"); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else { - ret = lGetString(sge_evc->ec, EV_session); - } -@@ -2463,7 +2463,7 @@ static ev_registration_id ec2_get_id(sge - - DENTER(EVC_LAYER, "ec2_get_id"); - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - DRETURN(EV_ID_INVALID); - } - -@@ -2512,7 +2512,7 @@ static bool ec2_commit_local(sge_evc_cla - - /* not yet initialized? Cannot send modification to qmaster! */ - if (sge_evc->ec == NULL) { -- DPRINTF((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ DPRINTF((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - } else if (thiz->ec_need_new_registration(thiz)) { - /* not (yet) registered? Cannot send modification to qmaster! */ - DPRINTF((MSG_EVENT_NOTREGISTERED)); -@@ -2790,7 +2790,7 @@ static bool ec2_get(sge_evc_class_t *thi - PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT); - - if (sge_evc->ec == NULL) { -- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC)); - ret = false; - } else if (thiz->ec_need_new_registration(thiz)) { - sge_evc->next_event = 1; -@@ -2937,7 +2937,7 @@ static bool ec2_get(sge_evc_class_t *thi - lGetUlong(sge_evc->ec, EV_id), NULL, &alp) - != CL_RETVAL_OK) { - answer_list_output(&alp); -- WARNING((SGE_EVENT, MSG_COMMD_FAILEDTOSENDACKEVENTDELIVERY )); -+ WARNING((SGE_EVENT, "%s", MSG_COMMD_FAILEDTOSENDACKEVENTDELIVERY )); - } else { - DPRINTF(("Sent ack for all events lower or equal %d\n", - (sge_evc->next_event - 1))); -@@ -3075,7 +3075,7 @@ static bool ck_event_number(lList *lp, u - do not change waiting_for because - we still wait for this number - */ -- ERROR((SGE_EVENT, MSG_EVENT_EVENTSWITHNOINCREASINGNUMBERS )); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_EVENTSWITHNOINCREASINGNUMBERS )); - if (wrong_number) { - *wrong_number = j; - } -@@ -3152,7 +3152,7 @@ static bool get_event_list(sge_evc_class - ret = false; - } else { - if (cull_unpack_list(&pb, report_list)) { -- ERROR((SGE_EVENT, MSG_LIST_FAILEDINCULLUNPACKREPORT )); -+ ERROR((SGE_EVENT, "%s", MSG_LIST_FAILEDINCULLUNPACKREPORT )); - ret = false; - } - clear_packbuffer(&pb); -diff -up GE2011.11p1/source/libs/evm/sge_event_master.c.format GE2011.11p1/source/libs/evm/sge_event_master.c ---- GE2011.11p1/source/libs/evm/sge_event_master.c.format 2012-05-23 13:04:40.000000000 -0600 -+++ GE2011.11p1/source/libs/evm/sge_event_master.c 2014-10-03 21:11:16.321852102 -0600 -@@ -458,7 +458,7 @@ int sge_add_event_client(lListElem *clio - - /* check event client object structure */ - if (lCompListDescr(lGetElemDescr(clio), EV_Type) != 0) { -- ERROR((SGE_EVENT, MSG_EVE_INCOMPLETEEVENTCLIENT)); -+ ERROR((SGE_EVENT, "%s", MSG_EVE_INCOMPLETEEVENTCLIENT)); - answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR); - DRETURN(STATUS_DENIED); - } -@@ -471,7 +471,7 @@ int sge_add_event_client(lListElem *clio - } - - if (lGetBool(clio, EV_changed) && lGetList(clio, EV_subscribed) == NULL) { -- ERROR((SGE_EVENT, MSG_EVE_INVALIDSUBSCRIPTION)); -+ ERROR((SGE_EVENT, "%s", MSG_EVE_INVALIDSUBSCRIPTION)); - answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR); - DRETURN(STATUS_ESEMANTIC); - } -@@ -481,7 +481,7 @@ int sge_add_event_client(lListElem *clio - - if (Event_Master_Control.is_prepare_shutdown) { - sge_mutex_unlock("event_master_mutex", SGE_FUNC, __LINE__, &Event_Master_Control.mutex); -- ERROR((SGE_EVENT, MSG_EVE_QMASTERISGOINGDOWN)); -+ ERROR((SGE_EVENT, "%s", MSG_EVE_QMASTERISGOINGDOWN)); - answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR); - DRETURN(STATUS_ESEMANTIC); - } -@@ -525,7 +525,7 @@ int sge_add_event_client(lListElem *clio - */ - if (update_func == NULL && !manop_is_manager(ruser)) { - sge_mutex_unlock("event_master_mutex", SGE_FUNC, __LINE__, &Event_Master_Control.mutex); -- ERROR((SGE_EVENT, MSG_WRONG_USER_FORFIXEDID )); -+ ERROR((SGE_EVENT, "%s", MSG_WRONG_USER_FORFIXEDID )); - answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR); - DRETURN(STATUS_ESEMANTIC); - } -@@ -728,7 +728,7 @@ sge_event_master_process_mod_event_clien - if (lGetBool(clio, EV_changed) && lGetList(clio, EV_subscribed) == NULL) { - sge_mutex_unlock("event_master_mutex", SGE_FUNC, __LINE__, &Event_Master_Control.mutex); - SGE_UNLOCK(LOCK_GLOBAL, LOCK_READ); -- ERROR((SGE_EVENT, MSG_EVE_INVALIDSUBSCRIPTION)); -+ ERROR((SGE_EVENT, "%s", MSG_EVE_INVALIDSUBSCRIPTION)); - DRETURN_VOID; - } - -@@ -1142,7 +1142,7 @@ int sge_shutdown_event_client(u_long32 e - - /* Print out a message about the event. */ - if (event_client_id == EV_ID_SCHEDD) { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_COM_KILLED_SCHEDULER)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_COM_KILLED_SCHEDULER)); - } else { - SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_COM_SHUTDOWNNOTIFICATION_SUS, - lGetString(client, EV_name), -diff -up GE2011.11p1/source/libs/gdi/qm_name.c.format GE2011.11p1/source/libs/gdi/qm_name.c ---- GE2011.11p1/source/libs/gdi/qm_name.c.format 2012-05-23 13:04:42.000000000 -0600 -+++ GE2011.11p1/source/libs/gdi/qm_name.c 2014-10-03 21:11:16.321852102 -0600 -@@ -74,7 +74,7 @@ char *err_str - if (!master_host || !master_file) { - if (err_str) { - if (master_host) { -- sprintf(err_str, MSG_GDI_NULLPOINTERPASSED ); -+ sprintf(err_str, "%s", MSG_GDI_NULLPOINTERPASSED ); - } - } - DRETURN(-1); -diff -up GE2011.11p1/source/libs/gdi/sge_gdi2.c.format GE2011.11p1/source/libs/gdi/sge_gdi2.c ---- GE2011.11p1/source/libs/gdi/sge_gdi2.c.format 2012-05-23 13:04:42.000000000 -0600 -+++ GE2011.11p1/source/libs/gdi/sge_gdi2.c 2014-10-03 21:11:16.322852125 -0600 -@@ -662,7 +662,7 @@ sge_gdi2_get_any_request(sge_gdi_ctx_cla - } - - if (!rhost) { -- ERROR((SGE_EVENT, MSG_GDI_RHOSTISNULLFORGETANYREQUEST )); -+ ERROR((SGE_EVENT, "%s", MSG_GDI_RHOSTISNULLFORGETANYREQUEST )); - PROF_STOP_MEASUREMENT(SGE_PROF_GDI); - DRETURN(-1); - } -@@ -1212,7 +1212,7 @@ gdi2_send_message(sge_gdi_ctx_class_t *s - if (handle == NULL) - { - ERROR((SGE_EVENT, MSG_GDI_CANT_CREATE_HANDLE_TOEXECD_S, tocomproc)); -- ERROR((SGE_EVENT, cl_get_error_text(commlib_error))); -+ ERROR((SGE_EVENT, "%s", cl_get_error_text(commlib_error))); - } - } - } -@@ -1327,7 +1327,7 @@ gdi2_receive_message(sge_gdi_ctx_class_t - if (handle == NULL) - { - ERROR((SGE_EVENT, MSG_GDI_CANT_CREATE_HANDLE_TOEXECD_S, fromcommproc)); -- ERROR((SGE_EVENT, cl_get_error_text(commlib_error))); -+ ERROR((SGE_EVENT, "%s", cl_get_error_text(commlib_error))); - } - } - } -@@ -1482,7 +1482,7 @@ lListElem **lepp - } - - if (!is_global_requested && !lepp) { -- ERROR((SGE_EVENT, MSG_NULLPOINTER)); -+ ERROR((SGE_EVENT, "%s", MSG_NULLPOINTER)); - lFreeElem(&hep); - DRETURN(-3); - } -@@ -1523,7 +1523,7 @@ lListElem **lepp - } - - if (!(*gepp = lGetElemHost(lp, CONF_name, SGE_GLOBAL_NAME))) { -- ERROR((SGE_EVENT, MSG_CONF_NOGLOBAL)); -+ ERROR((SGE_EVENT, "%s", MSG_CONF_NOGLOBAL)); - lFreeList(&lp); - lFreeElem(&hep); - DRETURN(-5); -@@ -1764,12 +1764,12 @@ int report_list_send(sge_gdi_ctx_class_t - DRETURN(-2); - - case PACK_FORMAT: -- ERROR((SGE_EVENT, MSG_GDI_REPORTFORMATERROR)); -+ ERROR((SGE_EVENT, "%s", MSG_GDI_REPORTFORMATERROR)); - clear_packbuffer(&pb); - DRETURN(-3); - - default: -- ERROR((SGE_EVENT, MSG_GDI_REPORTUNKNOWERROR)); -+ ERROR((SGE_EVENT, "%s", MSG_GDI_REPORTUNKNOWERROR)); - clear_packbuffer(&pb); - DRETURN(-1); - } -diff -up GE2011.11p1/source/libs/gdi/sge_gdi_ctx.c.format GE2011.11p1/source/libs/gdi/sge_gdi_ctx.c ---- GE2011.11p1/source/libs/gdi/sge_gdi_ctx.c.format 2012-05-23 13:04:42.000000000 -0600 -+++ GE2011.11p1/source/libs/gdi/sge_gdi_ctx.c 2014-10-03 21:11:16.323852148 -0600 -@@ -898,7 +898,7 @@ static int sge_gdi_ctx_class_prepare_enr - case SCHEDD: - case EXECD: - { -- INFO((SGE_EVENT,MSG_GDI_MULTI_THREADED_STARTUP)); -+ INFO((SGE_EVENT, "%s", MSG_GDI_MULTI_THREADED_STARTUP)); - /* if SGE_DEBUG_LEVEL environment is set we use gdi log flush function */ - /* you can set commlib debug level with env SGE_COMMLIB_DEBUG */ - if (env_sge_commlib_debug != NULL) { -@@ -911,7 +911,7 @@ static int sge_gdi_ctx_class_prepare_enr - break; - default: - { -- INFO((SGE_EVENT,MSG_GDI_SINGLE_THREADED_STARTUP)); -+ INFO((SGE_EVENT, "%s", MSG_GDI_SINGLE_THREADED_STARTUP)); - if (env_sge_commlib_debug != NULL) { - cl_ret = cl_com_setup_commlib(CL_NO_THREAD, CL_LOG_OFF, sge_gdi_ctx_log_flush_func); - } else { -@@ -1171,7 +1171,7 @@ static int sge_gdi_ctx_class_prepare_enr - alive_back = thiz->is_alive(thiz); - cl_ret = cl_com_set_error_func(general_communication_error); - if (cl_ret != CL_RETVAL_OK) { -- ERROR((SGE_EVENT, cl_get_error_text(cl_ret)) ); -+ ERROR((SGE_EVENT, "%s", cl_get_error_text(cl_ret)) ); - } - - if (alive_back == CL_RETVAL_OK && getenv("SGE_TEST_HEARTBEAT_TIMEOUT") == NULL ) { -@@ -1300,7 +1300,7 @@ static int sge_gdi_ctx_class_is_alive(sg - sge_gdi_ctx_class_error(thiz, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR, - "cl_commlib_get_endpoint_status failed: "SFQ, cl_get_error_text(cl_ret)); - } else { -- DEBUG((SGE_EVENT,MSG_GDI_QMASTER_STILL_RUNNING)); -+ DEBUG((SGE_EVENT, "%s", MSG_GDI_QMASTER_STILL_RUNNING)); - } - - if (status != NULL) { -@@ -1970,7 +1970,7 @@ int sge_gdi2_setup(sge_gdi_ctx_class_t * - - if (context_ref && sge_gdi_ctx_is_setup(*context_ref)) { - if (alpp_was_null) { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_GDI_GDI_ALREADY_SETUP)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_GDI_GDI_ALREADY_SETUP)); - } else { - answer_list_add_sprintf(alpp, STATUS_EEXIST, ANSWER_QUALITY_WARNING, - MSG_GDI_GDI_ALREADY_SETUP); -diff -up GE2011.11p1/source/libs/gdi/sge_gdi_packet_internal.c.format GE2011.11p1/source/libs/gdi/sge_gdi_packet_internal.c ---- GE2011.11p1/source/libs/gdi/sge_gdi_packet_internal.c.format 2012-05-23 13:04:42.000000000 -0600 -+++ GE2011.11p1/source/libs/gdi/sge_gdi_packet_internal.c 2014-10-03 21:11:16.324852172 -0600 -@@ -537,7 +537,7 @@ sge_gdi_packet_execute_external(sge_gdi_ - cl_get_error_text(commlib_error))); - } - } else { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_GDI_SENDINGGDIREQUESTFAILED)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_GDI_SENDINGGDIREQUESTFAILED)); - } - answer_list_add(answer_list, SGE_EVENT, STATUS_NOQMASTER, ANSWER_QUALITY_ERROR); - ret = false; -@@ -689,7 +689,7 @@ sge_gdi_packet_execute_external(sge_gdi_ - } - if (gdi_mismatch) { - /* For unusual errors, give more detail */ -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_GDI_MISMATCH_SEND_RECEIVE)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_GDI_MISMATCH_SEND_RECEIVE)); - answer_list_add(answer_list, SGE_EVENT, STATUS_NOQMASTER, ANSWER_QUALITY_ERROR); - ret = false; - } -diff -up GE2011.11p1/source/libs/gdi/sge_qexec.c.format GE2011.11p1/source/libs/gdi/sge_qexec.c ---- GE2011.11p1/source/libs/gdi/sge_qexec.c.format 2012-05-23 13:04:42.000000000 -0600 -+++ GE2011.11p1/source/libs/gdi/sge_qexec.c 2014-10-03 21:11:16.324852172 -0600 -@@ -190,7 +190,7 @@ sge_tid_t sge_qexecve(sge_gdi_ctx_class_ - - if (init_packbuffer(&pb, 1024, 0) != PACK_SUCCESS) { - lFreeElem(&petrep); -- sprintf(lasterror, MSG_GDI_OUTOFMEMORY); -+ sprintf(lasterror, "%s", MSG_GDI_OUTOFMEMORY); - DRETURN(NULL); - } - -diff -up GE2011.11p1/source/libs/gdi/sge_security.c.format GE2011.11p1/source/libs/gdi/sge_security.c ---- GE2011.11p1/source/libs/gdi/sge_security.c.format 2012-05-23 13:04:42.000000000 -0600 -+++ GE2011.11p1/source/libs/gdi/sge_security.c 2014-10-03 21:11:16.325852195 -0600 -@@ -173,7 +173,7 @@ int sge_ssl_setup_security_path(const ch - DENTER(TOP_LAYER, "sge_ssl_setup_security_path"); - - if (progname == NULL) { -- CRITICAL((SGE_EVENT, MSG_GDI_NO_VALID_PROGRAMM_NAME)); -+ CRITICAL((SGE_EVENT, "%s", MSG_GDI_NO_VALID_PROGRAMM_NAME)); - FREE(user_name); - DRETURN(-1); - } -@@ -473,7 +473,7 @@ static cl_bool_t ssl_cert_verify_func(cl - - if (value == NULL) { - /* This should never happen */ -- CRITICAL((SGE_EVENT, MSG_SEC_CERT_VERIFY_FUNC_NO_VAL)); -+ CRITICAL((SGE_EVENT, "%s", MSG_SEC_CERT_VERIFY_FUNC_NO_VAL)); - DRETURN(CL_FALSE); - } - -@@ -1385,15 +1385,15 @@ sge_gdi_packet_parse_auth_info(sge_gdi_p - answer_list_add(answer_list, SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR); - } - } else { -- ERROR((SGE_EVENT, MSG_GDI_FAILEDTOEXTRACTAUTHINFO)); -+ ERROR((SGE_EVENT, "%s", MSG_GDI_FAILEDTOEXTRACTAUTHINFO)); - answer_list_add(answer_list, SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR); - } - } else { -- ERROR((SGE_EVENT, MSG_GDI_FAILEDTOEXTRACTAUTHINFO)); -+ ERROR((SGE_EVENT, "%s", MSG_GDI_FAILEDTOEXTRACTAUTHINFO)); - answer_list_add(answer_list, SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR); - } - } else { -- ERROR((SGE_EVENT, MSG_GDI_FAILEDTOEXTRACTAUTHINFO)); -+ ERROR((SGE_EVENT, "%s", MSG_GDI_FAILEDTOEXTRACTAUTHINFO)); - answer_list_add(answer_list, SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR); - } - DRETURN(ret); -diff -up GE2011.11p1/source/libs/japi/drmaa.c.format GE2011.11p1/source/libs/japi/drmaa.c ---- GE2011.11p1/source/libs/japi/drmaa.c.format 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/libs/japi/drmaa.c 2014-10-03 21:11:16.326852218 -0600 -@@ -3885,7 +3885,7 @@ static char *drmaa_expand_wd_path(const - - /* First look for the job index placeholder. It is illegal. */ - if (strstr(path, "$TASK_ID") != NULL) { -- sprintf(str, MSG_DRMAA_INC_NOT_ALLOWED); -+ sprintf(str, "%s", MSG_DRMAA_INC_NOT_ALLOWED); - answer_list_add(answer_list, str, STATUS_ENOSUCHUSER, - ANSWER_QUALITY_ERROR); - DRETURN(NULL); -diff -up GE2011.11p1/source/libs/mir/sge_mirror.c.format GE2011.11p1/source/libs/mir/sge_mirror.c ---- GE2011.11p1/source/libs/mir/sge_mirror.c.format 2012-05-23 13:04:40.000000000 -0600 -+++ GE2011.11p1/source/libs/mir/sge_mirror.c 2014-10-03 21:11:16.327852242 -0600 -@@ -953,10 +953,10 @@ static sge_mirror_error _sge_mirror_unsu - evc->ec_unsubscribe(evc, sgeE_SCHEDDMONITOR); - break; - case SGE_TYPE_SHUTDOWN: -- ERROR((SGE_EVENT, MSG_EVENT_HAVETOHANDLEEVENTS)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_HAVETOHANDLEEVENTS)); - break; - case SGE_TYPE_MARK_4_REGISTRATION: -- ERROR((SGE_EVENT, MSG_EVENT_HAVETOHANDLEEVENTS)); -+ ERROR((SGE_EVENT, "%s", MSG_EVENT_HAVETOHANDLEEVENTS)); - break; - case SGE_TYPE_SUBMITHOST: - evc->ec_unsubscribe(evc, sgeE_SUBMITHOST_LIST); -@@ -1062,7 +1062,7 @@ sge_mirror_error sge_mirror_process_even - lFreeList(&event_list); - } - } else { -- WARNING((SGE_EVENT, MSG_MIRROR_QMASTERALIVETIMEOUTEXPIRED)); -+ WARNING((SGE_EVENT, "%s", MSG_MIRROR_QMASTERALIVETIMEOUTEXPIRED)); - evc->ec_mark4registration(evc); - ret = SGE_EM_TIMEOUT; - } -@@ -1071,7 +1071,7 @@ sge_mirror_error sge_mirror_process_even - test_debug++; - if (test_debug > 3) { - test_debug = 0; -- WARNING((SGE_EVENT, MSG_MIRROR_QMASTERALIVETIMEOUTEXPIRED)); -+ WARNING((SGE_EVENT, "%s", MSG_MIRROR_QMASTERALIVETIMEOUTEXPIRED)); - evc->ec_mark4registration(evc); - ret = SGE_EM_TIMEOUT; - } -diff -up GE2011.11p1/source/libs/sched/sge_select_queue.c.format GE2011.11p1/source/libs/sched/sge_select_queue.c ---- GE2011.11p1/source/libs/sched/sge_select_queue.c.format 2012-05-23 13:04:40.000000000 -0600 -+++ GE2011.11p1/source/libs/sched/sge_select_queue.c 2014-10-03 21:11:16.329852288 -0600 -@@ -339,7 +339,7 @@ find_best_result(dispatch_t r1, dispatch - DRETURN(DISPATCH_MISSING_ATTR); - } - -- CRITICAL((SGE_EVENT, MSG_JOBMATCHINGUNEXPECTEDRESULT)); -+ CRITICAL((SGE_EVENT, "%s", MSG_JOBMATCHINGUNEXPECTEDRESULT)); - DRETURN(DISPATCH_NEVER); - } - -@@ -893,7 +893,7 @@ parallel_maximize_slots_pe(sge_assignmen - /* --- prepare the posible slots for the binary search */ - max_slotsp = (max_slots - min_slots+1); - if (!add_pe_slots_to_category(&use_category, &max_slotsp, pe, min_slots, max_slots, pe_range)) { -- ERROR((SGE_EVENT, MSG_SGETEXT_NOMEM)); -+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_NOMEM)); - DRETURN(DISPATCH_NEVER_CAT); - } - if (max_slotsp == 0) { -@@ -6380,7 +6380,7 @@ void sge_create_load_list(const lList *q - - error: - DPRINTF(("error in sge_create_load_list!")); -- ERROR((SGE_EVENT, MSG_SGETEXT_CONSUMABLE_AS_LOAD)); -+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_CONSUMABLE_AS_LOAD)); - sge_free_load_list(load_list); - DRETURN_VOID; - -diff -up GE2011.11p1/source/libs/sched/sge_ssi.c.format GE2011.11p1/source/libs/sched/sge_ssi.c ---- GE2011.11p1/source/libs/sched/sge_ssi.c.format 2012-05-23 13:04:40.000000000 -0600 -+++ GE2011.11p1/source/libs/sched/sge_ssi.c 2014-10-03 21:11:16.329852288 -0600 -@@ -202,7 +202,7 @@ bool sge_ssi_job_start(sge_evc_class_t * - lListElem *queue, *granted_queue; - - if(tasks[i].host_name == NULL) { -- ERROR((SGE_EVENT, MSG_SSI_MISSINGHOSTNAMEINTASKLIST)); -+ ERROR((SGE_EVENT, "%s", MSG_SSI_MISSINGHOSTNAMEINTASKLIST)); - DRETURN(false); - } - -diff -up GE2011.11p1/source/libs/sgeobj/config.c.format GE2011.11p1/source/libs/sgeobj/config.c ---- GE2011.11p1/source/libs/sgeobj/config.c.format 2012-05-23 13:04:43.000000000 -0600 -+++ GE2011.11p1/source/libs/sgeobj/config.c 2014-10-03 21:11:16.330852312 -0600 -@@ -749,7 +749,7 @@ bool set_conf_enum(lList **alpp, lList * - } - - if(!uval) { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_GDI_CONFIGINVALIDQUEUESPECIFIED )); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_GDI_CONFIGINVALIDQUEUESPECIFIED )); - answer_list_add(alpp, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - DEXIT; - return false; -diff -up GE2011.11p1/source/libs/sgeobj/sge_answer.c.format GE2011.11p1/source/libs/sgeobj/sge_answer.c ---- GE2011.11p1/source/libs/sgeobj/sge_answer.c.format 2012-05-23 13:04:42.000000000 -0600 -+++ GE2011.11p1/source/libs/sgeobj/sge_answer.c 2014-10-03 21:11:16.330852312 -0600 -@@ -1016,19 +1016,19 @@ static bool answer_log(lListElem *answer - - switch (lGetUlong(answer, AN_quality)) { - case ANSWER_QUALITY_CRITICAL: -- CRITICAL((SGE_EVENT, lGetString(answer, AN_text))); -+ CRITICAL((SGE_EVENT, "%s", lGetString(answer, AN_text))); - ret = true; - break; - case ANSWER_QUALITY_ERROR: -- ERROR((SGE_EVENT, lGetString(answer, AN_text))); -+ ERROR((SGE_EVENT, "%s", lGetString(answer, AN_text))); - ret = true; - break; - case ANSWER_QUALITY_WARNING: -- WARNING((SGE_EVENT, lGetString(answer, AN_text))); -+ WARNING((SGE_EVENT, "%s", lGetString(answer, AN_text))); - break; - case ANSWER_QUALITY_INFO: - if (show_info) { -- INFO((SGE_EVENT, lGetString(answer, AN_text))); -+ INFO((SGE_EVENT, "%s", lGetString(answer, AN_text))); - } - break; - default: -diff -up GE2011.11p1/source/libs/sgeobj/sge_attr.c.format GE2011.11p1/source/libs/sgeobj/sge_attr.c ---- GE2011.11p1/source/libs/sgeobj/sge_attr.c.format 2012-05-23 13:04:42.000000000 -0600 -+++ GE2011.11p1/source/libs/sgeobj/sge_attr.c 2014-10-03 21:11:16.331852335 -0600 -@@ -414,7 +414,7 @@ attr_list_add(lList **this_list, lList * - if (ambiguous_href_list != NULL && - lGetNumberOfElem(*ambiguous_href_list) >= 1 && - !(flags & HOSTATTR_ALLOW_AMBIGUITY)) { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTR_RESULTUNAMBIGUOUS_S)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTR_RESULTUNAMBIGUOUS_S)); - answer_list_add(answer_list, SGE_EVENT, - STATUS_ERROR1, ANSWER_QUALITY_ERROR); - } else { -@@ -583,7 +583,7 @@ attr_list_find_value(const lList *this_l - /* - * Should never happen. - */ -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTR_NOCONFVALUE)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTR_NOCONFVALUE)); - answer_list_add(answer_list, SGE_EVENT, - STATUS_ERROR1, ANSWER_QUALITY_ERROR); - } -@@ -640,7 +640,7 @@ attr_list_find_value_href(const lList *t - /* - * Should never happen. - */ -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTR_NOCONFVALUE)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTR_NOCONFVALUE)); - answer_list_add(answer_list, SGE_EVENT, - STATUS_ERROR1, ANSWER_QUALITY_ERROR); - } -@@ -852,7 +852,7 @@ attr_list_parse_from_string(lList **this - value[0] = '\0'; - value++; - } else { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", - MSG_ATTR_EQUALSIGNEXPRECTED)); - answer_list_add(answer_list, SGE_EVENT, - STATUS_ERROR1, ANSWER_QUALITY_ERROR); -@@ -895,7 +895,7 @@ attr_list_parse_from_string(lList **this - } - } - } else { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTR_NOVALUEGIVEN)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTR_NOVALUEGIVEN)); - answer_list_add(answer_list, SGE_EVENT, - STATUS_ERROR1, ANSWER_QUALITY_ERROR); - ret = false; -diff -up GE2011.11p1/source/libs/sgeobj/sge_calendar.c.format GE2011.11p1/source/libs/sgeobj/sge_calendar.c ---- GE2011.11p1/source/libs/sgeobj/sge_calendar.c.format 2012-05-23 13:04:42.000000000 -0600 -+++ GE2011.11p1/source/libs/sgeobj/sge_calendar.c 2014-10-03 21:11:16.331852335 -0600 -@@ -475,7 +475,7 @@ static u_long32 is_week_entry_active(lLi - state = is_week_entry_active(new_tm, week_entry, limit, next_state, rec_count++); - } - else { -- ERROR((SGE_EVENT, MSG_CALENDAR_CALCTERMINATED)); -+ ERROR((SGE_EVENT, "%s", MSG_CALENDAR_CALCTERMINATED)); - } - - lFreeElem(&new_tm); -@@ -1293,7 +1293,7 @@ static int disabled_year_entry(lListElem - DRETURN(-1); - } - } else { -- sprintf(parse_error, MSG_ANSWER_GOTEQUALWITHOUTDAYTIMERANGEORSTATE ); -+ sprintf(parse_error, "%s", MSG_ANSWER_GOTEQUALWITHOUTDAYTIMERANGEORSTATE ); - goto ERROR; - } - -@@ -1402,7 +1402,7 @@ static int year_day_range(lListElem **tm - DRETURN(-1); - } - if (tm_yday_cmp(t1, t2)>0) { -- sprintf(parse_error, MSG_ANSWER_FIRSTYESTERDAYINRANGEMUSTBEBEFORESECONDYESTERDAY); -+ sprintf(parse_error, "%s", MSG_ANSWER_FIRSTYESTERDAYINRANGEMUSTBEBEFORESECONDYESTERDAY); - lFreeElem(&t1); - DRETURN(-1); - } -@@ -1442,7 +1442,7 @@ static int year_day(lListElem **tm) { - } - - if (scan(NULL, NULL)!=DOT) { -- sprintf(parse_error, MSG_PARSE_MISSINGPOINTAFTERDAY); -+ sprintf(parse_error, "%s", MSG_PARSE_MISSINGPOINTAFTERDAY); - DRETURN(-1); - } - eat_token(); -@@ -1452,7 +1452,7 @@ static int year_day(lListElem **tm) { - } - - if (scan(NULL, NULL)!=DOT) { -- sprintf(parse_error, MSG_PARSE_MISSINGPOINTAFTERMONTH ); -+ sprintf(parse_error, "%s", MSG_PARSE_MISSINGPOINTAFTERMONTH ); - DRETURN(-1); - } - eat_token(); -@@ -1634,7 +1634,7 @@ static int daytime_range(lListElem **tmr - goto ERROR; - } - if (scan(NULL, NULL)!=MINUS) { -- sprintf(parse_error, MSG_PARSE_MISSINGDASHINDAYTIMERANGE); -+ sprintf(parse_error, "%s", MSG_PARSE_MISSINGDASHINDAYTIMERANGE); - goto ERROR; - } - eat_token(); -@@ -1642,7 +1642,7 @@ static int daytime_range(lListElem **tmr - goto ERROR; - } - if (!tm_daytime_cmp(t1, t2)) { -- sprintf(parse_error, MSG_PARSE_RANGEBEGISEQUALTOEND); -+ sprintf(parse_error, "%s", MSG_PARSE_RANGEBEGISEQUALTOEND); - goto ERROR; - } - -@@ -1703,7 +1703,7 @@ static int daytime(lListElem **tm) { - SUCCESS: - if (h==24) { - if (m || s) { -- sprintf(parse_error, MSG_PARSE_DAYTIMESBEYOND24HNOTALLOWED); -+ sprintf(parse_error, "%s", MSG_PARSE_DAYTIMESBEYOND24HNOTALLOWED); - DRETURN(-1); - } - } -@@ -1804,7 +1804,7 @@ static int disabled_week_list(lList **al - - /* complain about still unused tokens */ - if (scan(NULL, NULL)!=NO_TOKEN) { -- sprintf(parse_error, MSG_PARSE_UNRECOGNIZEDTOKENATEND); -+ sprintf(parse_error, "%s", MSG_PARSE_UNRECOGNIZEDTOKENATEND); - goto ERROR; - } - -@@ -1857,7 +1857,7 @@ static int disabled_week_entry(lListElem - goto ERROR; - } - } else { -- sprintf(parse_error, MSG_ANSWER_GOTEQUALWITHOUTDAYTIMERANGEORSTATE); -+ sprintf(parse_error, "%s", MSG_ANSWER_GOTEQUALWITHOUTDAYTIMERANGEORSTATE); - goto ERROR; - } - -@@ -2153,7 +2153,7 @@ static int week_day_range(lListElem **tm - goto ERROR; - - if (tm_wday_cmp(t1, t2)==0) { -- sprintf(parse_error, MSG_PARSE_FOUNDUSELESSWEEKDAYRANGE); -+ sprintf(parse_error, "%s", MSG_PARSE_FOUNDUSELESSWEEKDAYRANGE); - goto ERROR; - } - } -@@ -2204,7 +2204,7 @@ static int week_day(lListElem **tm) { - DENTER(TOP_LAYER, "week_day"); - - if (scan(NULL, NULL)!=STRING) { -- sprintf(parse_error, MSG_PARSE_EXPECTEDSTRINGFORWEEKDAY); -+ sprintf(parse_error, "%s", MSG_PARSE_EXPECTEDSTRINGFORWEEKDAY); - DRETURN(-1); - } - s = get_string(); -@@ -2286,7 +2286,7 @@ static int scan(const char *s, token_set - for (j=0; t[j] && isdigit((int) t[j]); j++) { - number = old_number * 10 + (t[j]-'0'); - if (number<old_number) { -- ERROR((SGE_EVENT, MSG_PARSE_OVERFLOWERRORWHILEPARSING)); -+ ERROR((SGE_EVENT, "%s", MSG_PARSE_OVERFLOWERRORWHILEPARSING)); - token = ERR_TOKEN; - token_is_valid = 1; - DRETURN(token); -diff -up GE2011.11p1/source/libs/sgeobj/sge_centry.c.format GE2011.11p1/source/libs/sgeobj/sge_centry.c ---- GE2011.11p1/source/libs/sgeobj/sge_centry.c.format 2012-05-23 13:04:42.000000000 -0600 -+++ GE2011.11p1/source/libs/sgeobj/sge_centry.c 2014-10-03 21:11:16.332852358 -0600 -@@ -882,7 +882,7 @@ centry_list_parse_from_string(lList *com - /* allocate space for attribute list if no list is passed */ - if (complex_attributes == NULL) { - if ((complex_attributes = lCreateList("qstat_l_requests", CE_Type)) == NULL) { -- ERROR((SGE_EVENT, MSG_PARSE_NOALLOCATTRLIST)); -+ ERROR((SGE_EVENT, "%s", MSG_PARSE_NOALLOCATTRLIST)); - DRETURN(NULL); - } - } -@@ -920,7 +920,7 @@ centry_list_parse_from_string(lList *com - /* create new element, fill in the values and append it */ - if ( (complex_attribute= lGetElemStr(complex_attributes, CE_name, attr)) == NULL) { - if ((complex_attribute = lCreateElem(CE_Type)) == NULL) { -- ERROR((SGE_EVENT, MSG_PARSE_NOALLOCATTRELEM)); -+ ERROR((SGE_EVENT, "%s", MSG_PARSE_NOALLOCATTRELEM)); - lFreeList(&complex_attributes); - sge_free_saved_vars(context); - DRETURN(NULL); -diff -up GE2011.11p1/source/libs/sgeobj/sge_conf.c.format GE2011.11p1/source/libs/sgeobj/sge_conf.c ---- GE2011.11p1/source/libs/sgeobj/sge_conf.c.format 2012-05-23 13:04:43.000000000 -0600 -+++ GE2011.11p1/source/libs/sgeobj/sge_conf.c 2014-10-03 21:11:16.535857093 -0600 -@@ -308,7 +308,7 @@ static int jsv_threshold = 5000; - static tConfEntry conf_entries[] = { - { "execd_spool_dir", 1, NULL, 1, NULL }, - { "mailer", 1, MAILER, 1, NULL }, -- { "xterm", 1, "/usr/bin/X11/xterm",1, NULL }, -+ { "xterm", 1, "/usr/bin/xterm",1, NULL }, - { "load_sensor", 1, "none", 1, NULL }, - { "prolog", 1, PROLOG, 1, NULL }, - { "epilog", 1, EPILOG, 1, NULL }, -@@ -1051,7 +1051,7 @@ int merge_configuration(lList **answer_l - lFreeList(&mlist); - - if (!global) { -- WARNING((SGE_EVENT, MSG_CONF_NOCONFIGFROMMASTER)); -+ WARNING((SGE_EVENT, "%s", MSG_CONF_NOCONFIGFROMMASTER)); - DRETURN(-2); - } - -diff -up GE2011.11p1/source/libs/sgeobj/sge_cqueue.c.format GE2011.11p1/source/libs/sgeobj/sge_cqueue.c ---- GE2011.11p1/source/libs/sgeobj/sge_cqueue.c.format 2012-05-23 13:04:42.000000000 -0600 -+++ GE2011.11p1/source/libs/sgeobj/sge_cqueue.c 2014-10-03 21:11:16.333852381 -0600 -@@ -1251,7 +1251,7 @@ cqueue_xattr_pre_gdi(lList *this_list, l - cqueue_attribute_array[index].href_attr); - - if (strcmp(HOSTREF_DEFAULT, attr_hostname)) { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", - MSG_CQUEUE_NONDEFNOTALLOWED)); - answer_list_add(answer_list, SGE_EVENT, - STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); -@@ -1507,7 +1507,7 @@ cqueue_list_locate_qinstance_msg(lList * - sge_dstring_free(&host_domain_buffer); - } else { - if (raise_error) { -- ERROR((SGE_EVENT, MSG_CQUEUE_FULLNAMEISNULL)); -+ ERROR((SGE_EVENT, "%s", MSG_CQUEUE_FULLNAMEISNULL)); - } - } - DRETURN(ret); -diff -up GE2011.11p1/source/libs/sgeobj/sge_job.c.format GE2011.11p1/source/libs/sgeobj/sge_job.c ---- GE2011.11p1/source/libs/sgeobj/sge_job.c.format 2012-05-23 13:04:42.000000000 -0600 -+++ GE2011.11p1/source/libs/sgeobj/sge_job.c 2014-10-03 21:11:16.334852405 -0600 -@@ -1166,11 +1166,11 @@ int job_list_add_job(lList **job_list, c - DENTER(TOP_LAYER, "job_list_add_job"); - - if (!job_list) { -- ERROR((SGE_EVENT, MSG_JOB_JLPPNULL)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_JLPPNULL)); - DRETURN(1); - } - if (!job) { -- ERROR((SGE_EVENT, MSG_JOB_JEPNULL)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_JEPNULL)); - DRETURN(1); - } - -@@ -1906,7 +1906,7 @@ void job_check_correct_id_sublists(lList - if (field[i] != JB_ja_structure) - range_correct_end(range); - if (range_is_id_within(range, 0)) { -- ERROR((SGE_EVENT, MSG_JOB_NULLNOTALLOWEDT)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_NULLNOTALLOWEDT)); - answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN, - ANSWER_QUALITY_ERROR); - DRETURN_VOID; -@@ -1941,7 +1941,7 @@ void job_check_correct_id_sublists(lList - } - has_structure = !range_list_is_empty(lGetList(job, JB_ja_structure)); - if (!has_structure) { -- ERROR((SGE_EVENT, MSG_JOB_NOIDNOTALLOWED)); -+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOIDNOTALLOWED)); - answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN, - ANSWER_QUALITY_ERROR); - DRETURN_VOID; -@@ -2608,7 +2608,7 @@ int job_resolve_host_for_path_list(const - answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - ret_error=true; - } else if (res != CL_RETVAL_PARAMS) { -- ERROR((SGE_EVENT,MSG_PARSE_NULLPOINTERRECEIVED )); -+ ERROR((SGE_EVENT, "%s", MSG_PARSE_NULLPOINTERRECEIVED )); - answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - ret_error=true; - } -@@ -2625,13 +2625,13 @@ int job_resolve_host_for_path_list(const - - if(hostname == NULL){ - if(temp_hostname == NULL){ -- ERROR((SGE_EVENT, MSG_PARSE_DUPLICATEHOSTINFILESPEC)); -+ ERROR((SGE_EVENT, "%s", MSG_PARSE_DUPLICATEHOSTINFILESPEC)); - answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - ret_error=true; - } - } - else if( temp_hostname && strcmp(hostname, temp_hostname)==0){ -- ERROR((SGE_EVENT, MSG_PARSE_DUPLICATEHOSTINFILESPEC)); -+ ERROR((SGE_EVENT, "%s", MSG_PARSE_DUPLICATEHOSTINFILESPEC)); - answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - ret_error=true; - } -diff -up GE2011.11p1/source/libs/sgeobj/sge_jsv_script.c.format GE2011.11p1/source/libs/sgeobj/sge_jsv_script.c ---- GE2011.11p1/source/libs/sgeobj/sge_jsv_script.c.format 2012-05-23 13:04:43.000000000 -0600 -+++ GE2011.11p1/source/libs/sgeobj/sge_jsv_script.c 2014-10-03 21:11:16.335852428 -0600 -@@ -3029,7 +3029,7 @@ bool jsv_is_modify_rejected(sge_gdi_ctx_ - /* - * JSV is active but no modification allowed - */ -- ERROR((SGE_EVENT, MSG_JSV_ALLOWED)); -+ ERROR((SGE_EVENT, "%s", MSG_JSV_ALLOWED)); - answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - ret = true; - } -diff -up GE2011.11p1/source/libs/sgeobj/sge_pack.c.format GE2011.11p1/source/libs/sgeobj/sge_pack.c ---- GE2011.11p1/source/libs/sgeobj/sge_pack.c.format 2012-05-23 13:04:43.000000000 -0600 -+++ GE2011.11p1/source/libs/sgeobj/sge_pack.c 2014-10-03 21:11:16.335852428 -0600 -@@ -69,7 +69,7 @@ lCondition *lWhereFromElem(const lListEl - if (lGetUlong(where, PACK_id) == SGE_WHERE) { - size = getByteArray(&buffer, where, PACK_string); - if (size <= 0){ -- ERROR((SGE_EVENT, MSG_PACK_INVALIDPACKDATA )); -+ ERROR((SGE_EVENT, "%s", MSG_PACK_INVALIDPACKDATA )); - } else if ((ret = init_packbuffer_from_buffer(&pb, buffer, size)) == PACK_SUCCESS) { - cull_unpack_cond(&pb, &cond); - clear_packbuffer(&pb); -@@ -117,7 +117,7 @@ lEnumeration *lWhatFromElem(const lListE - if (lGetUlong(what, PACK_id) == SGE_WHAT) { - size = getByteArray(&buffer, what, PACK_string); - if (size <= 0){ -- ERROR((SGE_EVENT, MSG_PACK_INVALIDPACKDATA )); -+ ERROR((SGE_EVENT, "%s", MSG_PACK_INVALIDPACKDATA )); - } else if ((ret = init_packbuffer_from_buffer(&pb, buffer, size)) == PACK_SUCCESS) { - cull_unpack_enum(&pb, &cond); - clear_packbuffer(&pb); -diff -up GE2011.11p1/source/libs/sgeobj/sge_qref.c.format GE2011.11p1/source/libs/sgeobj/sge_qref.c ---- GE2011.11p1/source/libs/sgeobj/sge_qref.c.format 2012-05-23 13:04:42.000000000 -0600 -+++ GE2011.11p1/source/libs/sgeobj/sge_qref.c 2014-10-03 21:11:16.335852428 -0600 -@@ -815,7 +815,7 @@ qref_list_is_valid(const lList *this_lis - } - } - } else { -- ERROR((SGE_EVENT, MSG_QREF_QNOTREQUESTABLE)); -+ ERROR((SGE_EVENT, "%s", MSG_QREF_QNOTREQUESTABLE)); - answer_list_add(answer_list, SGE_EVENT, - STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); - ret = false; -diff -up GE2011.11p1/source/libs/sgeobj/sge_range.c.format GE2011.11p1/source/libs/sgeobj/sge_range.c ---- GE2011.11p1/source/libs/sgeobj/sge_range.c.format 2012-05-23 13:04:42.000000000 -0600 -+++ GE2011.11p1/source/libs/sgeobj/sge_range.c 2014-10-03 21:11:16.336852451 -0600 -@@ -1694,7 +1694,7 @@ void range_parse_from_string(lListElem * - DRETURN_VOID; - } - else { -- sprintf( msg, MSG_GDI_NEGATIVSTEP ); -+ sprintf( msg, "%s", MSG_GDI_NEGATIVSTEP ); - answer_list_add(answer_list, msg, STATUS_ESYNTAX, - ANSWER_QUALITY_ERROR); - lFreeElem(&r); -@@ -1769,7 +1769,7 @@ range_list_parse_from_string(lList **thi - s; s = sge_strtok_r(NULL, RANGE_SEPARATOR_CHARS, &context)) { - if (!first && undefined) { - /* first was undefined - no more ranges allowed */ -- ERROR((SGE_EVENT, MSG_GDI_UNEXPECTEDRANGEFOLLOWINGUNDEFINED)); -+ ERROR((SGE_EVENT, "%s", MSG_GDI_UNEXPECTEDRANGEFOLLOWINGUNDEFINED)); - sge_free_saved_vars(context); - answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, - ANSWER_QUALITY_ERROR); -@@ -1785,7 +1785,7 @@ range_list_parse_from_string(lList **thi - undefined = true; - } else { - /* second range may not be undefined ! */ -- ERROR((SGE_EVENT, MSG_GDI_UNEXPECTEDUNDEFINEDFOLLOWINGRANGE)); -+ ERROR((SGE_EVENT, "%s", MSG_GDI_UNEXPECTEDUNDEFINEDFOLLOWINGRANGE)); - sge_free_saved_vars(context); - answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, - ANSWER_QUALITY_ERROR); -diff -up GE2011.11p1/source/libs/sgeobj/sge_resource_quota.c.format GE2011.11p1/source/libs/sgeobj/sge_resource_quota.c ---- GE2011.11p1/source/libs/sgeobj/sge_resource_quota.c.format 2012-05-23 13:04:42.000000000 -0600 -+++ GE2011.11p1/source/libs/sgeobj/sge_resource_quota.c 2014-10-03 21:11:16.337852475 -0600 -@@ -106,7 +106,7 @@ bool rqs_parse_filter_from_string(lListE - /* We have a expanded list */ - lSetBool(tmp_filter, RQRF_expand, true); - if (buffer[strlen(buffer)-1] != '}') { -- ERROR((SGE_EVENT, MSG_RESOURCEQUOTA_NOVALIDEXPANDEDLIST)); -+ ERROR((SGE_EVENT, "%s", MSG_RESOURCEQUOTA_NOVALIDEXPANDEDLIST)); - answer_list_add(alp, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - DRETURN(false); - } -diff -up GE2011.11p1/source/libs/sgeobj/sge_schedd_conf.c.format GE2011.11p1/source/libs/sgeobj/sge_schedd_conf.c ---- GE2011.11p1/source/libs/sgeobj/sge_schedd_conf.c.format 2012-05-23 13:04:43.000000000 -0600 -+++ GE2011.11p1/source/libs/sgeobj/sge_schedd_conf.c 2014-10-03 21:11:16.337852475 -0600 -@@ -571,7 +571,7 @@ bool sconf_set_config(lList **config, lL - } else { - *master_sconf_list = store; - if (!*master_sconf_list) { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_USE_DEFAULT_CONFIG)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_USE_DEFAULT_CONFIG)); - answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_WARNING); - - *master_sconf_list = lCreateList("schedd config list", SC_Type); -@@ -2579,7 +2579,7 @@ void sconf_print_config(void){ - DENTER(TOP_LAYER, "sconf_print_config"); - - if (!sconf_is()){ -- ERROR((SGE_EVENT, MSG_SCONF_NO_CONFIG)); -+ ERROR((SGE_EVENT, "%s", MSG_SCONF_NO_CONFIG)); - DRETURN_VOID; - } - -@@ -2815,7 +2815,7 @@ bool sconf_validate_config_(lList **answ - pos.new_config = true; - - if (!calc_pos()){ -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_INCOMPLETE_SCHEDD_CONFIG)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_INCOMPLETE_SCHEDD_CONFIG)); - answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - ret = false; - } -@@ -2912,7 +2912,7 @@ bool sconf_validate_config_(lList **answ - const char *schedd_info = lGetString(lFirst(*(object_type_get_master_list(SGE_TYPE_SCHEDD_CONF))), SC_schedd_job_info); - - if (schedd_info == NULL){ -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTRIB_SCHEDDJOBINFONOVALIDPARAM )); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTRIB_SCHEDDJOBINFONOVALIDPARAM )); - answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - ret = false; - } -@@ -2928,7 +2928,7 @@ bool sconf_validate_config_(lList **answ - else if (!strcmp("job_list", key)) - ikey = SCHEDD_JOB_INFO_JOB_LIST; - else { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTRIB_SCHEDDJOBINFONOVALIDPARAM )); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTRIB_SCHEDDJOBINFONOVALIDPARAM )); - answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - ret = false; - } -@@ -2939,7 +2939,7 @@ bool sconf_validate_config_(lList **answ - INF_NOT_ALLOWED); - if (rlp == NULL) { - lFreeList(&alp); -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTRIB_SCHEDDJOBINFONOVALIDJOBLIST)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTRIB_SCHEDDJOBINFONOVALIDJOBLIST)); - answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - ret = false; - } -@@ -3050,7 +3050,7 @@ bool sconf_validate_config_(lList **answ - else { - /* ensure we get a non-zero/non-infinity duration default in reservation scheduling mode */ - if (max_reservation != 0 && uval == 0) { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_RR_REQUIRES_DEFAULT_DURATION)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_RR_REQUIRES_DEFAULT_DURATION)); - answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - ret = false; - } -diff -up GE2011.11p1/source/libs/sgeobj/sge_ulong.c.format GE2011.11p1/source/libs/sgeobj/sge_ulong.c ---- GE2011.11p1/source/libs/sgeobj/sge_ulong.c.format 2012-05-23 13:04:43.000000000 -0600 -+++ GE2011.11p1/source/libs/sgeobj/sge_ulong.c 2014-10-03 21:11:16.338852498 -0600 -@@ -272,7 +272,7 @@ ulong_parse_date_time_from_string(u_long - memset(tmp_str, 0, sizeof(tmp_str)); - - if (!string || string[0] == '\0') { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_NODATE)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_NODATE)); - if (answer_list) { - answer_list_add(answer_list, SGE_EVENT, - STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); -@@ -285,7 +285,7 @@ ulong_parse_date_time_from_string(u_long - } - - if (strlen(string) > sizeof(stringT)) { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_STARTTIMETOOLONG)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_STARTTIMETOOLONG)); - if (answer_list) { - answer_list_add(answer_list, SGE_EVENT, - STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); -@@ -309,7 +309,7 @@ ulong_parse_date_time_from_string(u_long - - if ((i != 0) && (i != 2)) { - sge_free_saved_vars(context); -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDSECONDS)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDSECONDS)); - if (answer_list) { - answer_list_add(answer_list, SGE_EVENT, - STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); -@@ -325,7 +325,7 @@ ulong_parse_date_time_from_string(u_long - - if ((i != 8) && (i != 10) && (i != 12)) { - sge_free_saved_vars(context); -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDHOURMIN)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDHOURMIN)); - if (answer_list) { - answer_list_add(answer_list, SGE_EVENT, - STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); -@@ -369,7 +369,7 @@ ulong_parse_date_time_from_string(u_long - timeptr.tm_mon=atoi(tmp_str)-1;/* 00==Jan, we don't like that do we */ - if ((timeptr.tm_mon>11)||(timeptr.tm_mon<0)) { - sge_free_saved_vars(context); -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDMONTH)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDMONTH)); - if (answer_list) { - answer_list_add(answer_list, SGE_EVENT, - STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); -@@ -392,7 +392,7 @@ ulong_parse_date_time_from_string(u_long - if ((timeptr.tm_mday > 31) || (timeptr.tm_mday < 1)) { - /* actually mktime() should frigging do it */ - sge_free_saved_vars(context); -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDDAY)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDDAY)); - if (answer_list) { - answer_list_add(answer_list, SGE_EVENT, - STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); -@@ -410,7 +410,7 @@ ulong_parse_date_time_from_string(u_long - non_seconds+=2; - - if ((timeptr.tm_hour > 23) || (timeptr.tm_hour < 0)) { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDHOUR)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDHOUR)); - if (answer_list) { - answer_list_add(answer_list, SGE_EVENT, - STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); -@@ -428,7 +428,7 @@ ulong_parse_date_time_from_string(u_long - - if ((timeptr.tm_min > 59)||(timeptr.tm_min < 0)) { - sge_free_saved_vars(context); -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDMINUTE)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDMINUTE)); - if (answer_list) { - answer_list_add(answer_list, SGE_EVENT, - STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); -@@ -445,7 +445,7 @@ ulong_parse_date_time_from_string(u_long - } - if ((timeptr.tm_sec>59)||(timeptr.tm_mday<0)) { - sge_free_saved_vars(context); -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDSECOND)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDSECOND)); - if (answer_list) { - answer_list_add(answer_list, SGE_EVENT, - STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); -@@ -468,7 +468,7 @@ ulong_parse_date_time_from_string(u_long - - if (gmt_secs < 0) { - sge_free_saved_vars(context); -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_NODATEFROMINPUT)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_NODATEFROMINPUT)); - if (answer_list) { - answer_list_add(answer_list, SGE_EVENT, - STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR); -@@ -610,7 +610,7 @@ ulong_parse_value_from_string(u_long32 * - - *this_ulong = strtol(string, &s, 10); - if (string == s) { -- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ULNG_INVALID_VALUE)); -+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ULNG_INVALID_VALUE)); - answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR); - ret = false; - } -diff -up GE2011.11p1/source/libs/sgeobj/sge_userset.c.format GE2011.11p1/source/libs/sgeobj/sge_userset.c ---- GE2011.11p1/source/libs/sgeobj/sge_userset.c.format 2012-05-23 13:04:42.000000000 -0600 -+++ GE2011.11p1/source/libs/sgeobj/sge_userset.c 2014-10-03 21:11:16.338852498 -0600 -@@ -279,7 +279,7 @@ int userset_validate_entries(lListElem * - - for_each(ep, lGetList(userset, US_entries)) { - if (!lGetPosString(ep, name_pos)) { -- ERROR((SGE_EVENT, MSG_US_INVALIDUSERNAME)); -+ ERROR((SGE_EVENT, "%s", MSG_US_INVALIDUSERNAME)); - answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, - ANSWER_QUALITY_ERROR); - DRETURN(STATUS_ESEMANTIC); -diff -up GE2011.11p1/source/libs/uti/config_file.c.format GE2011.11p1/source/libs/uti/config_file.c ---- GE2011.11p1/source/libs/uti/config_file.c.format 2012-05-23 13:04:41.000000000 -0600 -+++ GE2011.11p1/source/libs/uti/config_file.c 2014-10-03 21:11:16.339852521 -0600 -@@ -440,7 +440,7 @@ char **allowed - } - - if (name_len==0) { -- sprintf(err_str, MSG_CONF_ATLEASTONECHAR); -+ sprintf(err_str, "%s", MSG_CONF_ATLEASTONECHAR); - if (config_errfunc) - config_errfunc(err_str); - return 1; -diff -up GE2011.11p1/source/libs/uti/setup_path.c.format GE2011.11p1/source/libs/uti/setup_path.c ---- GE2011.11p1/source/libs/uti/setup_path.c.format 2012-05-23 13:04:41.000000000 -0600 -+++ GE2011.11p1/source/libs/uti/setup_path.c 2014-10-03 21:11:16.339852521 -0600 -@@ -348,7 +348,7 @@ bool sge_setup_paths(u_long32 progid, co - cell_root = sge_malloc(strlen(sge_root) + strlen(sge_cell) + 2); - if (cell_root == NULL) { - if (error_dstring == NULL) { -- CRITICAL((SGE_EVENT, MSG_SGETEXT_NOMEM)); -+ CRITICAL((SGE_EVENT, "%s", MSG_SGETEXT_NOMEM)); - SGE_EXIT(NULL, 1); - } else { - sge_dstring_copy_string(error_dstring, MSG_SGETEXT_NOMEM); -diff -up GE2011.11p1/source/libs/uti/sge_arch.c.format GE2011.11p1/source/libs/uti/sge_arch.c ---- GE2011.11p1/source/libs/uti/sge_arch.c.format 2012-05-23 13:04:41.000000000 -0600 -+++ GE2011.11p1/source/libs/uti/sge_arch.c 2014-10-03 21:11:16.339852521 -0600 -@@ -140,7 +140,7 @@ error: - if (buffer != NULL) { - sge_strlcpy(buffer, MSG_SGEROOTNOTSET, size); - } else { -- CRITICAL((SGE_EVENT, MSG_SGEROOTNOTSET)); -+ CRITICAL((SGE_EVENT, "%s", MSG_SGEROOTNOTSET)); - } - } - -@@ -240,7 +240,7 @@ const char *sge_get_alias_path(void) - - len = strlen(sge_root) + strlen(sge_cell) + strlen(COMMON_DIR) + strlen(ALIAS_FILE) + 5; - if (!(cp = malloc(len))) { -- CRITICAL((SGE_EVENT, MSG_MEMORY_MALLOCFAILEDFORPATHTOHOSTALIASFILE )); -+ CRITICAL((SGE_EVENT, "%s", MSG_MEMORY_MALLOCFAILEDFORPATHTOHOSTALIASFILE )); - SGE_EXIT(NULL, 1); - } - -diff -up GE2011.11p1/source/libs/uti/sge_bootstrap.c.format GE2011.11p1/source/libs/uti/sge_bootstrap.c ---- GE2011.11p1/source/libs/uti/sge_bootstrap.c.format 2012-05-23 13:04:41.000000000 -0600 -+++ GE2011.11p1/source/libs/uti/sge_bootstrap.c 2014-10-03 21:11:16.340852545 -0600 -@@ -469,7 +469,7 @@ bool sge_bootstrap(const char *bootstrap - /* get filepath of bootstrap file */ - if (bootstrap_file == NULL) { - if (error_dstring == NULL) { -- CRITICAL((SGE_EVENT, MSG_UTI_CANNOTRESOLVEBOOTSTRAPFILE)); -+ CRITICAL((SGE_EVENT, "%s", MSG_UTI_CANNOTRESOLVEBOOTSTRAPFILE)); - } else { - sge_dstring_sprintf(error_dstring, MSG_UTI_CANNOTRESOLVEBOOTSTRAPFILE); - } -diff -up GE2011.11p1/source/libs/uti/sge_csp_path.c.format GE2011.11p1/source/libs/uti/sge_csp_path.c ---- GE2011.11p1/source/libs/uti/sge_csp_path.c.format 2012-05-23 13:04:41.000000000 -0600 -+++ GE2011.11p1/source/libs/uti/sge_csp_path.c 2014-10-03 21:11:16.340852545 -0600 -@@ -151,7 +151,7 @@ static cl_bool_t ssl_cert_verify_func(cl - - if (value == NULL) { - /* This should never happen */ -- CRITICAL((SGE_EVENT, MSG_SEC_CERT_VERIFY_FUNC_NO_VAL)); -+ CRITICAL((SGE_EVENT, "%s", MSG_SEC_CERT_VERIFY_FUNC_NO_VAL)); - DEXIT; - return CL_FALSE; - } -diff -up GE2011.11p1/source/libs/uti/sge_edit.c.format GE2011.11p1/source/libs/uti/sge_edit.c ---- GE2011.11p1/source/libs/uti/sge_edit.c.format 2012-05-23 13:04:41.000000000 -0600 -+++ GE2011.11p1/source/libs/uti/sge_edit.c 2014-10-03 21:11:16.340852545 -0600 -@@ -53,7 +53,7 @@ int sge_edit(const char *fname, uid_t my - - if (fname == NULL) - { -- ERROR((SGE_EVENT, MSG_NULLPOINTER)); -+ ERROR((SGE_EVENT, "%s", MSG_NULLPOINTER)); - return -1; - } - -diff -up GE2011.11p1/source/libs/uti/sge_loadmem.c.format GE2011.11p1/source/libs/uti/sge_loadmem.c ---- GE2011.11p1/source/libs/uti/sge_loadmem.c.format 2012-05-23 13:04:41.000000000 -0600 -+++ GE2011.11p1/source/libs/uti/sge_loadmem.c 2014-10-03 21:11:16.341852568 -0600 -@@ -580,7 +580,7 @@ int sge_loadmem(sge_mem_info_t *mem_info - pagesize = sysconf(_SC_PAGESIZE); - first = 0; - if (pagesize == -1) { -- ERROR((SGE_EVENT, MSG_SYSTEM_NOPAGESIZEASSUME8192 )); -+ ERROR((SGE_EVENT, "%s", MSG_SYSTEM_NOPAGESIZEASSUME8192 )); - pagesize = 8192; - } - } -diff -up GE2011.11p1/source/libs/uti/sge_monitor.c.format GE2011.11p1/source/libs/uti/sge_monitor.c ---- GE2011.11p1/source/libs/uti/sge_monitor.c.format 2012-05-23 13:04:41.000000000 -0600 -+++ GE2011.11p1/source/libs/uti/sge_monitor.c 2014-10-03 21:11:16.341852568 -0600 -@@ -236,7 +236,7 @@ sge_monitor_init(monitoring_t *monitor, - monitor->output_line2 = (dstring*) malloc(sizeof(dstring)); - - if (monitor->output_line1 == NULL || monitor->output_line2 == NULL) { -- CRITICAL((SGE_EVENT, MSG_UTI_MONITOR_MEMERROR)); -+ CRITICAL((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROR)); - exit(1); - } - -@@ -257,7 +257,7 @@ sge_monitor_init(monitoring_t *monitor, - monitor->ext_output = &ext_sch_output; - } else { - monitor->ext_type = NONE_EXT; -- ERROR((SGE_EVENT, MSG_UTI_MONITOR_MEMERROREXT)); -+ ERROR((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROREXT)); - } - break; - -@@ -269,7 +269,7 @@ sge_monitor_init(monitoring_t *monitor, - monitor->ext_output = &ext_gdi_output; - } else { - monitor->ext_type = NONE_EXT; -- ERROR((SGE_EVENT, MSG_UTI_MONITOR_MEMERROREXT)); -+ ERROR((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROREXT)); - } - break; - -@@ -281,7 +281,7 @@ sge_monitor_init(monitoring_t *monitor, - monitor->ext_output = &ext_lis_output; - } else { - monitor->ext_type = NONE_EXT; -- ERROR((SGE_EVENT, MSG_UTI_MONITOR_MEMERROREXT)); -+ ERROR((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROREXT)); - } - break; - -@@ -293,7 +293,7 @@ sge_monitor_init(monitoring_t *monitor, - monitor->ext_output = &ext_edt_output; - } else { - monitor->ext_type = NONE_EXT; -- ERROR((SGE_EVENT, MSG_UTI_MONITOR_MEMERROREXT)); -+ ERROR((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROREXT)); - } - break; - -@@ -305,7 +305,7 @@ sge_monitor_init(monitoring_t *monitor, - monitor->ext_output = &ext_tet_output; - } else { - monitor->ext_type = NONE_EXT; -- ERROR((SGE_EVENT, MSG_UTI_MONITOR_MEMERROREXT)); -+ ERROR((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROREXT)); - } - break; - -diff -up GE2011.11p1/source/libs/uti/sge_os.c.format GE2011.11p1/source/libs/uti/sge_os.c ---- GE2011.11p1/source/libs/uti/sge_os.c.format 2012-05-23 13:04:41.000000000 -0600 -+++ GE2011.11p1/source/libs/uti/sge_os.c 2014-10-03 21:11:16.341852568 -0600 -@@ -352,12 +352,12 @@ bool sge_daemonize_prepare(sge_gdi_ctx_c - - /* create pipe */ - if ( pipe(fd_pipe) < 0) { -- CRITICAL((SGE_EVENT, MSG_UTI_DAEMONIZE_CANT_PIPE)); -+ CRITICAL((SGE_EVENT, "%s", MSG_UTI_DAEMONIZE_CANT_PIPE)); - DRETURN(false); - } - - if ( fcntl(fd_pipe[0], F_SETFL, O_NONBLOCK) != 0) { -- CRITICAL((SGE_EVENT, MSG_UTI_DAEMONIZE_CANT_FCNTL_PIPE)); -+ CRITICAL((SGE_EVENT, "%s", MSG_UTI_DAEMONIZE_CANT_FCNTL_PIPE)); - DRETURN(false); - } - -@@ -418,13 +418,13 @@ bool sge_daemonize_prepare(sge_gdi_ctx_c - - switch(exit_status) { - case SGE_DEAMONIZE_OK: -- INFO((SGE_EVENT, MSG_UTI_DAEMONIZE_OK)); -+ INFO((SGE_EVENT, "%s", MSG_UTI_DAEMONIZE_OK)); - break; - case SGE_DAEMONIZE_DEAD_CHILD: -- WARNING((SGE_EVENT, MSG_UTI_DAEMONIZE_DEAD_CHILD)); -+ WARNING((SGE_EVENT, "%s", MSG_UTI_DAEMONIZE_DEAD_CHILD)); - break; - case SGE_DAEMONIZE_TIMEOUT: -- WARNING((SGE_EVENT, MSG_UTI_DAEMONIZE_TIMEOUT)); -+ WARNING((SGE_EVENT, "%s", MSG_UTI_DAEMONIZE_TIMEOUT)); - break; - } - /* close read pipe */ -diff -up GE2011.11p1/source/libs/uti/sge_stdio.c.format GE2011.11p1/source/libs/uti/sge_stdio.c ---- GE2011.11p1/source/libs/uti/sge_stdio.c.format 2012-05-23 13:04:41.000000000 -0600 -+++ GE2011.11p1/source/libs/uti/sge_stdio.c 2014-10-03 21:11:16.342852591 -0600 -@@ -409,7 +409,7 @@ pid_t sge_peopen_r(const char *shell, in - DRETURN(-1); - } - } else { -- ERROR((SGE_EVENT, MSG_UTI_MEMPWNAM)); -+ ERROR((SGE_EVENT, "%s", MSG_UTI_MEMPWNAM)); - FREE(buffer); - if (sge_has_admin_user()) { - sge_switch2admin_user(); -@@ -429,7 +429,7 @@ pid_t sge_peopen_r(const char *shell, in - - if (myuid != SGE_SUPERUSER_UID) { - DPRINTF(("only root is allowed to switch to a different user\n")); -- ERROR((SGE_EVENT, MSG_SYSTEM_NOROOTRIGHTSTOSWITCHUSER)); -+ ERROR((SGE_EVENT, "%s", MSG_SYSTEM_NOROOTRIGHTSTOSWITCHUSER)); - FREE(buffer); - DRETURN(-2); - } -diff -up GE2011.11p1/source/libs/uti/sge_stdlib.c.format GE2011.11p1/source/libs/uti/sge_stdlib.c ---- GE2011.11p1/source/libs/uti/sge_stdlib.c.format 2012-05-23 13:04:41.000000000 -0600 -+++ GE2011.11p1/source/libs/uti/sge_stdlib.c 2014-10-03 21:11:16.342852591 -0600 -@@ -74,7 +74,7 @@ char *sge_malloc(int size) - - cp = (char *) malloc(size); - if (!cp) { -- CRITICAL((SGE_EVENT, MSG_MEMORY_MALLOCFAILED)); -+ CRITICAL((SGE_EVENT, "%s", MSG_MEMORY_MALLOCFAILED)); - DEXIT_; - abort(); - } -@@ -117,7 +117,7 @@ void *sge_realloc(void *ptr, int size, i - - cp = realloc(ptr, size); - if (cp == NULL) { -- CRITICAL((SGE_EVENT, MSG_MEMORY_REALLOCFAILED)); -+ CRITICAL((SGE_EVENT, "%s", MSG_MEMORY_REALLOCFAILED)); - if (do_abort) { - DEXIT; - abort(); -diff -up GE2011.11p1/source/libs/uti/sge_string.c.format GE2011.11p1/source/libs/uti/sge_string.c ---- GE2011.11p1/source/libs/uti/sge_string.c.format 2012-05-23 13:04:41.000000000 -0600 -+++ GE2011.11p1/source/libs/uti/sge_string.c 2014-10-03 21:11:16.342852591 -0600 -@@ -387,7 +387,7 @@ char *sge_strtok_r(const char *str, cons - - if (str != NULL) { - if (*context != NULL) { -- ERROR((SGE_EVENT, MSG_POINTER_INVALIDSTRTOKCALL)); -+ ERROR((SGE_EVENT, "%s", MSG_POINTER_INVALIDSTRTOKCALL)); - } - *context = (struct saved_vars_s *)malloc(sizeof(struct saved_vars_s)); - memset(*context, 0, sizeof(struct saved_vars_s)); -@@ -399,7 +399,7 @@ char *sge_strtok_r(const char *str, cons - saved_cp = saved->static_str; - } else { - if (*context == NULL) { -- ERROR((SGE_EVENT, MSG_POINTER_INVALIDSTRTOKCALL1)); -+ ERROR((SGE_EVENT, "%s", MSG_POINTER_INVALIDSTRTOKCALL1)); - DRETURN(NULL); - } - saved = *context; -diff -up GE2011.11p1/source/libs/uti/sge_uidgid.c.format GE2011.11p1/source/libs/uti/sge_uidgid.c ---- GE2011.11p1/source/libs/uti/sge_uidgid.c.format 2012-05-23 13:04:41.000000000 -0600 -+++ GE2011.11p1/source/libs/uti/sge_uidgid.c 2014-10-03 21:11:16.343852615 -0600 -@@ -242,7 +242,7 @@ int sge_set_admin_username(const char *u - } - if (!user || user[0] == '\0') { - if (err_str) { -- sprintf(err_str, MSG_POINTER_SETADMINUSERNAMEFAILED); -+ sprintf(err_str, "%s", MSG_POINTER_SETADMINUSERNAMEFAILED); - } - DEXIT; - return -1; -@@ -353,7 +353,7 @@ int sge_switch2admin_user(void) - DENTER(UIDGID_LAYER, "sge_switch2admin_user"); - - if (get_admin_user(&uid, &gid) == ESRCH) { -- CRITICAL((SGE_EVENT, MSG_SWITCH_USER_NOT_INITIALIZED)); -+ CRITICAL((SGE_EVENT, "%s", MSG_SWITCH_USER_NOT_INITIALIZED)); - abort(); - } - -@@ -425,7 +425,7 @@ int sge_switch2start_user(void) - DENTER(UIDGID_LAYER, "sge_switch2start_user"); - - if (get_admin_user(&uid, &gid) == ESRCH) { -- CRITICAL((SGE_EVENT, MSG_SWITCH_USER_NOT_INITIALIZED)); -+ CRITICAL((SGE_EVENT, "%s", MSG_SWITCH_USER_NOT_INITIALIZED)); - abort(); - } - -@@ -979,7 +979,7 @@ static int _sge_set_uid_gid_addgrp(const - sge_switch2start_user(); - - if (!sge_is_start_user_superuser()) { -- sprintf(err_str, MSG_SYSTEM_CHANGEUIDORGIDFAILED ); -+ sprintf(err_str, "%s", MSG_SYSTEM_CHANGEUIDORGIDFAILED ); - return -1; - } - -diff -up GE2011.11p1/source/libs/uti/sge_unistd.c.format GE2011.11p1/source/libs/uti/sge_unistd.c ---- GE2011.11p1/source/libs/uti/sge_unistd.c.format 2012-05-23 13:04:41.000000000 -0600 -+++ GE2011.11p1/source/libs/uti/sge_unistd.c 2014-10-03 21:11:16.343852615 -0600 -@@ -157,7 +157,7 @@ bool sge_unlink(const char *prefix, cons - DENTER(TOP_LAYER, "sge_unlink"); - - if (!suffix) { -- ERROR((SGE_EVENT, MSG_POINTER_SUFFIXISNULLINSGEUNLINK )); -+ ERROR((SGE_EVENT, "%s", MSG_POINTER_SUFFIXISNULLINSGEUNLINK )); - DEXIT; - return false; - } -@@ -349,11 +349,11 @@ int sge_mkdir(const char *path, int fmod - DENTER(TOP_LAYER, "sge_mkdir"); - if (!path) { - if (exit_on_error) { -- CRITICAL((SGE_EVENT,MSG_VAR_PATHISNULLINSGEMKDIR )); -+ CRITICAL((SGE_EVENT, "%s", MSG_VAR_PATHISNULLINSGEMKDIR )); - DCLOSE; - SGE_EXIT(NULL, 1); - } else { -- ERROR((SGE_EVENT, MSG_VAR_PATHISNULLINSGEMKDIR )); -+ ERROR((SGE_EVENT, "%s", MSG_VAR_PATHISNULLINSGEMKDIR )); - DEXIT; - return -1; - } -@@ -394,11 +394,11 @@ int sge_mkdir2(const char *base_dir, con - - if (base_dir == NULL || name == NULL) { - if (exit_on_error) { -- CRITICAL((SGE_EVENT,MSG_VAR_PATHISNULLINSGEMKDIR )); -+ CRITICAL((SGE_EVENT, "%s", MSG_VAR_PATHISNULLINSGEMKDIR )); - DCLOSE; - SGE_EXIT(NULL, 1); - } else { -- ERROR((SGE_EVENT, MSG_VAR_PATHISNULLINSGEMKDIR )); -+ ERROR((SGE_EVENT, "%s", MSG_VAR_PATHISNULLINSGEMKDIR )); - DRETURN(-1); - } - } -diff -up GE2011.11p1/source/libs/uti/test_sge_profiling.c.format GE2011.11p1/source/libs/uti/test_sge_profiling.c ---- GE2011.11p1/source/libs/uti/test_sge_profiling.c.format 2012-05-23 13:04:41.000000000 -0600 -+++ GE2011.11p1/source/libs/uti/test_sge_profiling.c 2014-10-03 21:11:16.344852638 -0600 -@@ -118,25 +118,25 @@ int do_test () { - /* if (thread_prof_active_by_id(pthread_self()) == true ) {*/ - - if(!prof_start(SGE_PROF_OTHER, &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } - - if(!prof_start(SGE_PROF_CUSTOM1, &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } - - if(!prof_set_level_name(SGE_PROF_CUSTOM1, "Main Loop", &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } - - if(!prof_set_level_name(SGE_PROF_OTHER, "other", &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } -@@ -180,7 +180,7 @@ int do_test () { - printf("%s\n", prof_get_info_string(SGE_PROF_ALL, false, &error)); - - if(!prof_reset(SGE_PROF_CUSTOM1, &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } -@@ -189,13 +189,13 @@ int do_test () { - printf("%s\n", prof_get_info_string(SGE_PROF_CUSTOM1, false, &error)); - - if(!prof_stop(SGE_PROF_CUSTOM1, &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } - - if(!prof_stop(SGE_PROF_OTHER, &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } -@@ -214,31 +214,31 @@ void* do_sleep(void* p) { - /* if (thread_prof_active_by_id(pthread_self()) == true ) {*/ - - if(!prof_start(SGE_PROF_OTHER, &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } - - if(!prof_start(SGE_PROF_CUSTOM1, &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } - - if(!prof_start(SGE_PROF_CUSTOM2, &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } - - if(!prof_set_level_name(SGE_PROF_CUSTOM1, "sleep thread", &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } - - if(!prof_set_level_name(SGE_PROF_CUSTOM2, "sleep_thread_printf", &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } -@@ -261,19 +261,19 @@ void* do_sleep(void* p) { - - /*if (thread_prof_active_by_id(pthread_self()) == true ) {*/ - if(!prof_stop(SGE_PROF_CUSTOM1, &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } - - if(!prof_stop(SGE_PROF_CUSTOM2, &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } - - if(!prof_stop(SGE_PROF_OTHER, &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } -@@ -293,13 +293,13 @@ void* do_calc(void* p) { - - /*if (thread_prof_active_by_id(pthread_self()) == true ) { */ - if(!prof_start(SGE_PROF_CUSTOM1, &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } - - if(!prof_set_level_name(SGE_PROF_CUSTOM1, "calc thread", &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } -@@ -327,7 +327,7 @@ void* do_calc(void* p) { - printf("%s\n", prof_get_info_string(SGE_PROF_ALL, false, &error)); - - if(!prof_stop(SGE_PROF_CUSTOM1, &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } -@@ -348,13 +348,13 @@ void* do_calc2(void* p) { - - /*if (thread_prof_active_by_id(pthread_self()) == true ) {*/ - if(!prof_start(SGE_PROF_CUSTOM1, &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } - - if(!prof_set_level_name(SGE_PROF_CUSTOM1, "calc2 thread", &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } -@@ -373,7 +373,7 @@ void* do_calc2(void* p) { - printf("%s\n", prof_get_info_string(SGE_PROF_ALL, false, &error)); - - if(!prof_stop(SGE_PROF_CUSTOM1, &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } -@@ -395,13 +395,13 @@ void* do_malloc(void* p) { - - /*if (thread_prof_active_by_id(pthread_self()) == true ) {*/ - if(!prof_start(SGE_PROF_CUSTOM1, &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } - - if(!prof_set_level_name(SGE_PROF_CUSTOM1, "malloc thread", &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } -@@ -419,7 +419,7 @@ void* do_malloc(void* p) { - printf("%s\n", prof_get_info_string(SGE_PROF_ALL, false, &error)); - - if(!prof_stop(SGE_PROF_CUSTOM1, &error)) { -- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr); -+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr); - fprintf(stderr, "\n"); - sge_dstring_clear(&error); - } -diff -up GE2011.11p1/source/utilbin/authuser.c.format GE2011.11p1/source/utilbin/authuser.c ---- GE2011.11p1/source/utilbin/authuser.c.format 2012-05-23 13:04:49.000000000 -0600 -+++ GE2011.11p1/source/utilbin/authuser.c 2014-10-03 21:11:16.344852638 -0600 -@@ -158,7 +158,7 @@ static void usage(void) { - static void print_error(const char* format, ...) { - va_list ap; - va_start(ap, format); -- fprintf(stderr, MSG_AUTHUSER_ERROR); -+ fprintf(stderr, "%s", MSG_AUTHUSER_ERROR); - vfprintf(stderr, format, ap); - fprintf(stderr, "\n"); - va_end(ap); -diff -up GE2011.11p1/source/utilbin/checkprog.c.format GE2011.11p1/source/utilbin/checkprog.c ---- GE2011.11p1/source/utilbin/checkprog.c.format 2012-05-23 13:04:49.000000000 -0600 -+++ GE2011.11p1/source/utilbin/checkprog.c 2014-10-03 21:11:16.345852661 -0600 -@@ -58,7 +58,7 @@ int i - void usage_checkprog(void) - { - fprintf(stderr, "\n"); -- fprintf(stderr, MSG_COMMAND_USAGECHECKPROG); -+ fprintf(stderr,"%s", MSG_COMMAND_USAGECHECKPROG); - fprintf(stderr, "\n"); - /*fprintf(stderr, "check the first 8 letters of process basename\n\n"); - fprintf(stderr, "exit status: 0 if process was found\n"); -@@ -71,7 +71,7 @@ void usage_checkprog(void) - void usage_getprogs(void) - { - fprintf(stderr, "\n"); -- fprintf(stderr,MSG_COMMAND_USAGEGETPROGS ); -+ fprintf(stderr,"%s", MSG_COMMAND_USAGEGETPROGS ); - fprintf(stderr, "\n"); - /* - fprintf(stderr, "check and list pids of "processname"\n\n"); -@@ -104,7 +104,7 @@ int main(int argc, char *argv[]) - else if (!strcmp(ptr, "getprogs")) - checkit = 0; - else { -- fprintf(stderr, MSG_COMMAND_CALLCHECKPROGORGETPROGS ); -+ fprintf(stderr, "%s", MSG_COMMAND_CALLCHECKPROGORGETPROGS ); - fprintf(stderr, "\n"); - exit(1); - } -@@ -172,7 +172,7 @@ int main(int argc, char *argv[]) - else if (res == 0) - printf(MSG_PROC_PIDISRUNNINGWITHNAME_IS , (int) pid, argv[2]); - else if (res == -1) -- printf(MSG_COMMAND_SPANPSFAILED ); -+ printf("%s", MSG_COMMAND_SPANPSFAILED ); - - if (res == -1) - res = 2; -diff -up GE2011.11p1/source/utilbin/gethostbyaddr.c.format GE2011.11p1/source/utilbin/gethostbyaddr.c ---- GE2011.11p1/source/utilbin/gethostbyaddr.c.format 2012-05-23 13:04:49.000000000 -0600 -+++ GE2011.11p1/source/utilbin/gethostbyaddr.c 2014-10-03 21:11:16.345852661 -0600 -@@ -212,13 +212,13 @@ int main(int argc, char *argv[]) - } - - if (he != NULL) { -- printf(MSG_SYSTEM_ALIASES ); -+ printf("%s", MSG_SYSTEM_ALIASES ); - - for (tp = he->h_aliases; *tp; tp++) - printf("%s ", *tp); - printf("\n"); - -- printf(MSG_SYSTEM_ADDRESSES ); -+ printf("%s", MSG_SYSTEM_ADDRESSES ); - - for (tp2 = he->h_addr_list; *tp2; tp2++) - printf("%s ", inet_ntoa(* (struct in_addr *) *tp2)); /* inet_ntoa() is not MT save */ -diff -up GE2011.11p1/source/utilbin/gethostbyname.c.format GE2011.11p1/source/utilbin/gethostbyname.c ---- GE2011.11p1/source/utilbin/gethostbyname.c.format 2012-05-23 13:04:49.000000000 -0600 -+++ GE2011.11p1/source/utilbin/gethostbyname.c 2014-10-03 21:11:16.345852661 -0600 -@@ -157,13 +157,13 @@ int main(int argc, char *argv[]) { - printf("SGE name: %s\n",resolved_name); - } - -- printf(MSG_SYSTEM_ALIASES ); -+ printf("%s", MSG_SYSTEM_ALIASES ); - - for (tp = he->h_aliases; *tp; tp++) - printf("%s ", *tp); - printf("\n"); - -- printf(MSG_SYSTEM_ADDRESSES ); -+ printf("%s", MSG_SYSTEM_ADDRESSES ); - for (tp2 = he->h_addr_list; *tp2; tp2++) - printf("%s ", inet_ntoa(* (struct in_addr *) *tp2)); /* inet_ntoa() is not MT save */ - printf("\n"); -diff -up GE2011.11p1/source/utilbin/gethostname.c.format GE2011.11p1/source/utilbin/gethostname.c ---- GE2011.11p1/source/utilbin/gethostname.c.format 2012-05-23 13:04:49.000000000 -0600 -+++ GE2011.11p1/source/utilbin/gethostname.c 2014-10-03 21:11:16.345852661 -0600 -@@ -149,13 +149,13 @@ int main(int argc,char *argv[]) { - printf("SGE name: %s\n",resolved_name); - } - -- printf(MSG_SYSTEM_ALIASES ); -+ printf("%s", MSG_SYSTEM_ALIASES ); - - for (tp = he->h_aliases; *tp; tp++) - printf("%s ", *tp); - printf("\n"); - -- printf(MSG_SYSTEM_ADDRESSES ); -+ printf("%s", MSG_SYSTEM_ADDRESSES ); - for (tp2 = he->h_addr_list; *tp2; tp2++) - printf("%s ", inet_ntoa(* (struct in_addr *) *tp2)); /* inet_ntoa() is not MT save */ - printf("\n"); -diff -up GE2011.11p1/source/utilbin/loadcheck.c.format GE2011.11p1/source/utilbin/loadcheck.c ---- GE2011.11p1/source/utilbin/loadcheck.c.format 2012-05-23 13:04:49.000000000 -0600 -+++ GE2011.11p1/source/utilbin/loadcheck.c 2014-10-03 21:11:16.346852685 -0600 -@@ -235,7 +235,7 @@ int main(int argc, char *argv[]) - memset(&mem_info, 0, sizeof(sge_mem_info_t)); - if (sge_loadmem(&mem_info)) - { -- fprintf(stderr, MSG_SYSTEM_RETMEMORYINDICESFAILED ); -+ fprintf(stderr, "%s", MSG_SYSTEM_RETMEMORYINDICESFAILED ); - fprintf(stderr, "\n"); - #ifndef WINDOWS - DEXIT; -diff -up GE2011.11p1/source/utilbin/qping.c.format GE2011.11p1/source/utilbin/qping.c ---- GE2011.11p1/source/utilbin/qping.c.format 2012-05-23 13:04:49.000000000 -0600 -+++ GE2011.11p1/source/utilbin/qping.c 2014-10-03 21:11:16.346852685 -0600 -@@ -365,7 +365,7 @@ static void qping_print_line(const char* - help[0]=0; - if (help2) { - snprintf(help_buffer,1024,"%s%s", cl_values[1], help2); -- snprintf(cl_values[1],1024, help_buffer); -+ snprintf(cl_values[1],1024, "%s", help_buffer); - } - } - -@@ -376,7 +376,7 @@ static void qping_print_line(const char* - help[0]=0; - if (help2) { - snprintf(help_buffer,1024,"%s%s", cl_values[3], help2); -- snprintf(cl_values[3],1024, help_buffer); -+ snprintf(cl_values[3],1024, "%s", help_buffer); - } - } - -diff -up GE2011.11p1/source/utilbin/sge_passwd.c.format GE2011.11p1/source/utilbin/sge_passwd.c ---- GE2011.11p1/source/utilbin/sge_passwd.c.format 2012-05-23 13:04:49.000000000 -0600 -+++ GE2011.11p1/source/utilbin/sge_passwd.c 2014-10-03 21:11:16.347852708 -0600 -@@ -295,7 +295,7 @@ sge_get_file_pub_key(void) - const char *cert = getenv("SGE_CERTFILE"); - - if (cert != NULL) { -- snprintf(file, 4096, cert); -+ snprintf(file, 4096, "%s", cert); - } else { - const char *sge_root = sge_get_root_dir(0, NULL, 0, 1); - const char *sge_cell = sge_get_default_cell(); -@@ -655,7 +655,7 @@ buffer_decrypt(const char *buffer_in, si - snprintf(err_str, MAX_STRING_SIZE, MSG_PWD_LOAD_PRIV_SSS, - SGE_PASSWD_PROG_NAME, file_priv_key, err_msg); - #ifdef DEFINE_SGE_PASSWD_MAIN -- fprintf(stderr, err_str); -+ fprintf(stderr, "%s", err_str); - #endif - DEXIT; - return 1; -@@ -685,7 +685,7 @@ buffer_decrypt(const char *buffer_in, si - snprintf(err_str, MAX_STRING_SIZE, MSG_PWD_MALLOC_SS, - SGE_PASSWD_PROG_NAME, err_msg); - #ifdef DEFINE_SGE_PASSWD_MAIN -- fprintf(stderr, err_str); -+ fprintf(stderr, "%s", err_str); - #endif - DEXIT; - return 1; -@@ -1198,7 +1198,7 @@ sge_passwd_add_change(const char *userna - password_write_file(users, encryped_pwd, - sge_get_file_dotpasswd(), sge_get_file_passwd()); - DPRINTF(("password table has been written\n")); -- fprintf(stdout, MSG_PWD_CHANGED); -+ fprintf(stdout, "%s", MSG_PWD_CHANGED); - fprintf(stdout, "\n"); - DEXIT; - } -diff -up GE2011.11p1/source/utilbin/spooldefaults.c.format GE2011.11p1/source/utilbin/spooldefaults.c ---- GE2011.11p1/source/utilbin/spooldefaults.c.format 2012-05-23 13:04:49.000000000 -0600 -+++ GE2011.11p1/source/utilbin/spooldefaults.c 2014-10-03 21:11:16.347852708 -0600 -@@ -113,13 +113,13 @@ static int init_framework(sge_gdi_ctx_cl - spooling_params); - answer_list_output(&answer_list); - if (spooling_context == NULL) { -- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT)); -+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT)); - } else { - spool_set_default_context(spooling_context); - - /* initialize spooling context */ - if (!spool_startup_context(&answer_list, spooling_context, true)) { -- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT)); -+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT)); - } else { - ret = EXIT_SUCCESS; - } -diff -up GE2011.11p1/source/utilbin/spooledit.c.format GE2011.11p1/source/utilbin/spooledit.c ---- GE2011.11p1/source/utilbin/spooledit.c.format 2012-05-23 13:04:49.000000000 -0600 -+++ GE2011.11p1/source/utilbin/spooledit.c 2014-10-03 21:11:16.347852708 -0600 -@@ -97,9 +97,9 @@ init_framework(sge_gdi_ctx_class_t *ctx, - spooling_params); - answer_list_output(&answer_list); - if (!strcmp(bootstrap_get_spooling_method(),"classic")) { -- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANTHANDLECLASSICSPOOLING)); -+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANTHANDLECLASSICSPOOLING)); - } else if (spooling_context == NULL) { -- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT)); -+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT)); - } else { - spool_set_default_context(spooling_context); - spool_set_option(&answer_list, spooling_context, "recover=false"); -@@ -107,7 +107,7 @@ init_framework(sge_gdi_ctx_class_t *ctx, - - /* initialize spooling context */ - if (!spool_startup_context(&answer_list, spooling_context, true)) { -- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT)); -+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT)); - } else { - /* search the berkeley db info - take it from any object type, - * berkeleydb spools all objects using the same rule. -@@ -264,7 +264,7 @@ dump_object(bdb_info info, const char *k - answer_list_output(&answer_list); - ret = EXIT_FAILURE; - } else { -- printf(job_script); -+ printf("%s", job_script); - FREE(job_script); - } - } else { -diff -up GE2011.11p1/source/utilbin/spoolinit.c.format GE2011.11p1/source/utilbin/spoolinit.c ---- GE2011.11p1/source/utilbin/spoolinit.c.format 2012-05-23 13:04:49.000000000 -0600 -+++ GE2011.11p1/source/utilbin/spoolinit.c 2014-10-03 21:11:16.347852708 -0600 -@@ -83,14 +83,14 @@ static int init_framework(const char *me - libargs); - answer_list_output(&answer_list); - if (spooling_context == NULL) { -- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT)); -+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT)); - } else { - spool_set_default_context(spooling_context); - - /* initialize spooling context */ - if (!spool_startup_context(&answer_list, spooling_context, - check_context)) { -- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT)); -+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT)); - } else { - ret = EXIT_SUCCESS; - } diff --git a/gridengine-ldflags.patch b/gridengine-ldflags.patch deleted file mode 100644 index a82955a..0000000 --- a/gridengine-ldflags.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -up GE2011.11p1/source/aimk.ldflags GE2011.11p1/source/aimk ---- GE2011.11p1/source/aimk.ldflags 2012-05-23 13:05:00.000000000 -0600 -+++ GE2011.11p1/source/aimk 2013-05-21 09:41:04.639062331 -0600 -@@ -314,7 +314,7 @@ set JNI_TARGET = "ALL" - set PROTECTED = 0 - set RUNPATH = "" - --set LFLAGS = "-L." -+set LFLAGS = "$LDFLAGS -L." - set XLFLAGS = "" - set XLIBS = "" - set XMLIBS = "" -diff -up GE2011.11p1/source/clients/qmon/Makefile.ldflags GE2011.11p1/source/clients/qmon/Makefile ---- GE2011.11p1/source/clients/qmon/Makefile.ldflags 2012-05-23 13:04:47.000000000 -0600 -+++ GE2011.11p1/source/clients/qmon/Makefile 2013-05-21 12:00:46.266888889 -0600 -@@ -152,7 +152,7 @@ messages: - # rules to build binaries - ############################################################################### - qmon: $(QMON_OBJS) $(QMON_ADD_OBJS) $(QMON_LIB_DEPENDS) -- $(LD_WRAPPER) $(CC) $(LFLAGS) $(LDFLAGS) $(XLFLAGS) -o $@ $(QMON_OBJS) $(QMON_ADD_OBJS) $(QMON_ADD_LIBS) $(XLIBS) $(SLIBS) $(LIBS) -+ $(LD_WRAPPER) $(CC) $(LFLAGS) $(XLFLAGS) -o $@ $(QMON_OBJS) $(QMON_ADD_OBJS) $(QMON_ADD_LIBS) $(XLIBS) $(SLIBS) $(LIBS) - - ############################################################################ - # ListTree Demo prog ---- GE2011.11p1/source/3rdparty/qtcsh/Makefile.in.ldflags 2012-05-23 13:04:53.000000000 -0600 -+++ GE2011.11p1/source/3rdparty/qtcsh/Makefile.in 2013-05-21 12:19:25.286578827 -0600 -@@ -335,19 +335,19 @@ - - tcsh:$(P) ${OBJS} - rm -f tcsh core -- ${CC} -o tcsh ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS} -+ ${CC} -o tcsh ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS} - - # Purify - pure:$(P) ${OBJS} - rm -f tcsh core -- purify `echo ${CC} | sed -e s,-B/bin/,,` -o tcsh ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS} -+ purify `echo ${CC} | sed -e s,-B/bin/,,` -o tcsh ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS} - # OS/2 - tcsh.exe: tcsh - emxbind tcsh - - gethost: gethost.c sh.err.h tc.const.h sh.h - rm -f gethost -- ${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${EXTRAFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS} -+ ${CC} -o gethost ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${EXTRAFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS} - - tc.defs.c: gethost host.defs - @rm -f $@ ---- GE2011.11p1/source/3rdparty/qtcsh/configure.ldflags 2012-05-23 13:04:53.000000000 -0600 -+++ GE2011.11p1/source/3rdparty/qtcsh/configure 2013-05-21 15:53:06.286076742 -0600 -@@ -2691,7 +2691,7 @@ - fi; - if test "$sge" != no; then - GRDDEF="-I../../../libs/gdi" -- GRDLIB="-L../../../$sge $(SGE_LIBS) ${LDFLAGS}" -+ GRDLIB="-L../../../$sge $(SGE_LIBS)" - CFLAGS="$CFLAGS -DPROG_NAME='"qtcsh"' -D$sge" - fi - diff --git a/gridengine-loadsensor.patch b/gridengine-loadsensor.patch deleted file mode 100644 index 13aba86..0000000 --- a/gridengine-loadsensor.patch +++ /dev/null @@ -1,133 +0,0 @@ -diff -up source/daemons/execd/sge_load_sensor.c.loadsensor source/daemons/execd/sge_load_sensor.c ---- source/daemons/execd/sge_load_sensor.c.loadsensor 2012-05-23 13:04:38.000000000 -0600 -+++ source/daemons/execd/sge_load_sensor.c 2012-10-03 15:10:46.129014819 -0600 -@@ -168,7 +168,7 @@ static int sge_ls_status(lListElem *this - { - fd_set writefds; - int ret; -- int higest_fd; -+ int highest_fd; - - DENTER(TOP_LAYER, "sge_ls_status"); - -@@ -178,11 +178,11 @@ static int sge_ls_status(lListElem *this - - /* build writefds */ - FD_ZERO(&writefds); -- higest_fd = fileno((FILE *) lGetRef(this_ls, LS_in)); -- FD_SET(higest_fd, &writefds); -+ highest_fd = fileno((FILE *) lGetRef(this_ls, LS_in)); -+ FD_SET(highest_fd, &writefds); - - /* is load sensor ready to read ? */ -- ret = select(higest_fd + 1, NULL, &writefds, NULL, NULL); -+ ret = select(highest_fd + 1, NULL, &writefds, NULL, NULL); - - if (ret <= 0) { - DRETURN(LS_BROKEN_PIPE); -@@ -263,9 +263,6 @@ static int sge_ls_start_ls(const char *q - DPRINTF(("%s: successfully started load sensor "%s"\n", - SGE_FUNC, lGetString(this_ls, LS_command))); - -- /* request first load report after starting */ -- ls_send_command(this_ls, "\n"); -- - return LS_OK; - } - -@@ -431,6 +428,11 @@ static int read_ls(void) - char value[1000]; - lListElem *ls_elem; - bool flag = true; -+ fd_set readfds; -+ struct timeval timeleft; -+ int wait = 1; -+ int highest_fd; -+ int ret; - - DENTER(TOP_LAYER, "read_ls"); - -@@ -441,10 +443,46 @@ static int read_ls(void) - continue; - } - -+ /* request load report from ls */ -+ ls_send_command(ls_elem, "\n"); -+ - DPRINTF(("receiving from %s\n", lGetString(ls_elem, LS_command))); - -+ highest_fd = fileno(file); - while (flag) { - if (fscanf(file, "%[^\n]\n", input) != 1) { -+ FD_ZERO(&readfds); -+ FD_SET(highest_fd, &readfds); -+ -+ /* wait up to 1 second per line for reading report */ -+ timeleft.tv_sec = wait; -+ timeleft.tv_usec = 0; -+ ret = select(highest_fd + 1, &readfds, NULL, NULL, &timeleft); -+ if (ret == -1) { -+ switch (errno) { -+ case EINTR: -+ DPRINTF(("select failed with EINTR\n")); -+ WARNING((SGE_EVENT, "[load_sensor %s] read select failed with EINTR", lGetString(ls_elem, LS_pid))); -+ break; -+ case EBADF: -+ DPRINTF(("select failed with EBADF\n")); -+ WARNING((SGE_EVENT, "[load_sensor %s] read select failed with EBADF", lGetString(ls_elem, LS_pid))); -+ break; -+ case EINVAL: -+ DPRINTF(("select failed with EINVAL\n")); -+ WARNING((SGE_EVENT, "[load_sensor %s] read select failed with EINVAL", lGetString(ls_elem, LS_pid))); -+ break; -+ default: -+ DPRINTF(("select failed with unexpected errno %d", errno)); -+ WARNING((SGE_EVENT, "[load_sensor %s] read select failed with [%s]", lGetString(ls_elem, LS_pid), strerror(errno))); -+ } -+ DRETURN(-1); -+ } -+ -+ /* if something is there now, go back and read it */ -+ if (ret) continue; -+ -+ /* nothing to read, so exit */ - break; - } - #ifdef INTERIX -@@ -467,9 +505,9 @@ static int read_ls(void) - lXchgList(ls_elem, LS_complete, &tmp_list); - lFreeList(&tmp_list); - -- /* request next load report from ls */ -- ls_send_command(ls_elem, "\n"); -- break; -+ /* see without waiting if there is any backlog to process, we'll exit if fscanf fails */ -+ wait = 0; -+ continue; - } - - /* add a newline for pattern matching in sscanf */ -@@ -524,19 +562,19 @@ static int ls_send_command(lListElem *th - struct timeval timeleft; - int ret; - FILE *file; -- int higest_fd; -+ int highest_fd; - - DENTER(TOP_LAYER, "ls_send_command"); - - FD_ZERO(&writefds); -- higest_fd = fileno((FILE *) lGetRef(this_ls, LS_in)); -- FD_SET(higest_fd, &writefds); -+ highest_fd = fileno((FILE *) lGetRef(this_ls, LS_in)); -+ FD_SET(highest_fd, &writefds); - - timeleft.tv_sec = 0; - timeleft.tv_usec = 0; - - /* wait for writing on fd_in */ -- ret = select(higest_fd + 1, NULL, &writefds, NULL, &timeleft); -+ ret = select(highest_fd + 1, NULL, &writefds, NULL, &timeleft); - if (ret == -1) { - switch (errno) { - case EINTR: diff --git a/gridengine-mingw.patch b/gridengine-mingw.patch deleted file mode 100644 index de47b6b..0000000 --- a/gridengine-mingw.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -up GE2011.11/source/aimk.mingw GE2011.11/source/aimk ---- GE2011.11/source/aimk.mingw 2012-03-21 15:04:40.985356138 -0600 -+++ GE2011.11/source/aimk 2012-03-21 15:35:53.436004441 -0600 -@@ -46,7 +46,7 @@ unsetenv AIMK_INSURE AIMK_TARGET_BITS ai - - set COMPILE_ARCH = "" - set COMPILE_DIR = "" --set buildarch = UNKNOWN -+set buildarch = mingw32 - set WINCC = "" - set WINCFLAGS = "" - set WINLFLAGS = "" -@@ -177,6 +177,7 @@ usage: - echo " -kerberos -> enable kerberos authentication" - echo " -man -> generate man pages" - echo " -mankv -> generate man pages checked out with '-kv' flag" -+ echo " -mingw32 -> compile with mingw32" - echo " -mo -> generate the message catalogues (Solaris only)" - echo " -no-core -> don't compile the core system" - echo " -no-java -> don't compile Java[TM] class files" -@@ -643,6 +644,10 @@ while ($#argv >= 1 && $?found) - set BUILDMAN = 1 - set KVMAN = 1 - breaksw -+ case "-mingw32": -+ set buildarch = mingw32 -+ set BUILDARCH = `scripts/compilearch -b $buildarch` -+ breaksw - case "-mo" - echo "BUILDARCH=$BUILDARCH" - if ( $BUILDARCH == sol-sparc || $BUILDARCH == sol-sparc64 ) then -@@ -1763,6 +1768,17 @@ case CYGWIN_X86: - - breaksw - -+case MINGW32: -+ set WINCC = i686-pc-mingw32-gcc -+ set HWLOC = 0 -+ set MAKEHWLOC = 0 -+ set DEPEND_FLAGS = "$CFLAGS" -+ set RM = "rm -f" -+ # Default build targets for WIN32_X86 for which we have seperate make files -+ set MAKEWINGRIDLIB = 1 -+ set MAKEWINGRIDAPP = 1 -+ breaksw -+ - case WIN32_X86: - setenv LD_LIBRARY_PATH /usr/lib/x86:/usr/local/lib - set CC = gcc -diff -up GE2011.11/source/libs/comm/cl_data_types.h.mingw GE2011.11/source/libs/comm/cl_data_types.h -diff -up GE2011.11/source/scripts/compilearch.mingw GE2011.11/source/scripts/compilearch ---- GE2011.11/source/scripts/compilearch.mingw 2012-03-21 15:04:40.657367886 -0600 -+++ GE2011.11/source/scripts/compilearch 2012-03-21 15:04:41.013355134 -0600 -@@ -228,6 +228,10 @@ case $buildarch in - BUILDARCH=LINUXX64 - TARGET_BITS=TARGET_64BIT - ;; -+ mingw32) -+ BUILDARCH=MINGW32 -+ TARGET_BITS=TARGET_32BIT -+ ;; - necsx4) - BUILDARCH=NECSX4 - TARGET_BITS=TARGET_64BIT diff --git a/gridengine-rctemplates.patch b/gridengine-rctemplates.patch deleted file mode 100644 index fa8caac..0000000 --- a/gridengine-rctemplates.patch +++ /dev/null @@ -1,354 +0,0 @@ -diff -up GE2011.11p1/source/dist/inst_sge.rctemplates GE2011.11p1/source/dist/inst_sge ---- GE2011.11p1/source/dist/inst_sge.rctemplates 2012-05-23 13:04:49.000000000 -0600 -+++ GE2011.11p1/source/dist/inst_sge 2012-07-09 14:11:10.645922508 -0600 -@@ -702,8 +702,7 @@ if [ "$UPDATE" = true ]; then - AddJMXFiles - fi - RestoreSequenceNumberFiles $QMDIR #Restore jobseqnum and arseqnum -- CreateSGEStartUpScripts $euid true master -- CreateSGEStartUpScripts $euid true execd -+ SetupDefaultUsers $euid - CreateSettingsFile - InitCA - SetupRcScriptNames master #New qmaster RC script/SMF -@@ -867,7 +866,6 @@ if [ "$BERKELEY" = "install" ]; then - Makedir $COMMONDIR - ProcessSGEClusterName "bdb" - SetSpoolingOptions -- AddSGEStartUpScript $euid "bdb" - PrepareRPCServerStart - GiveBerkelyHints - else -@@ -919,11 +917,9 @@ if [ "$QMASTER" = "install" -a "$UPDATE" - AddDefaultUsersets - AddCommonFiles - AddJMXFiles -- CreateSGEStartUpScripts $euid true master -- CreateSGEStartUpScripts $euid true execd -+ SetupDefaultUsers $euid - CreateSettingsFile - InitCA -- AddSGEStartUpScript $euid master - StartQmaster - AddWindowsAdmin - AddHosts -@@ -1091,7 +1087,6 @@ if [ "$EXECD" = "install" -a "$UPDATE" ! - GetLocalExecdSpoolDir - AddLocalConfiguration_With_Qconf - AddSubmitHostsExecd -- AddSGEStartUpScript $euid execd - SetupWinSvc execinst #service install during execd installation -> param: execinst - # CopyIBMLoadSensor - StartExecd -@@ -1127,7 +1122,6 @@ if [ "$EXECD" = "install" -a "$UPDATE" ! - CheckHostNameResolving install - GetLocalExecdSpoolDir - AddLocalConfiguration_With_Qconf -- AddSGEStartUpScript $euid execd - SetupWinSvc execinst #service install during execd installation -> param: execinst - # CopyIBMLoadSensor - StartExecd -@@ -1444,7 +1438,6 @@ if [ $SHADOW = "install" ]; then - if [ $SHADOW_HOST = `$SGE_UTILBIN/gethostname -aname` ]; then - . $SGE_ROOT/$SGE_CELL/common/settings.sh - SGE_ARCH=`$SGE_ROOT/util/arch` -- AddSGEStartUpScript $euid shadow - $INFOTEXT "Starting sge_shadowd on host %s\n" $SHADOW_HOST - $INFOTEXT -log "Starting sge_shadowd on host %s\n" $SHADOW_HOST - if [ "$SGE_ENABLE_SMF" = "true" ]; then -@@ -1690,20 +1683,7 @@ if [ $MAKE_RC = "true" ]; then - - COMMONDIR=$SGE_CELL/common - -- CreateSGEStartUpScripts 0 true master -- CreateSGEStartUpScripts 0 true execd -- -- $INFOTEXT "\nYour new startup scripts are created. You will find them in the\n" \ -- "directory:\n\n" \ -- " %s\n\n" \ -- "Your old startup scripts are saved in this directory as\n\n" \ -- " %s\n" \ -- " %s\n\n" \ -- $SGE_ROOT/$COMMONDIR sgemaster_$DATE sgeexecd_$DATE -- -- $INFOTEXT "Please now copy the new startup scripts to the system wide rc\n" \ -- "file location on all qmaster, shadowd and execution hosts." -- -+ SetupDefaultUser 0 - fi - - exit 0 -diff -up GE2011.11p1/source/dist/util/create_settings.sh.rctemplates GE2011.11p1/source/dist/util/create_settings.sh ---- GE2011.11p1/source/dist/util/create_settings.sh.rctemplates 2012-05-23 13:04:48.000000000 -0600 -+++ GE2011.11p1/source/dist/util/create_settings.sh 2012-07-09 14:14:11.614473681 -0600 -@@ -67,8 +67,6 @@ SP_SH=$1/settings.sh - echo "setenv SGE_ROOT $SGE_ROOT" > $SP_CSH - echo "" >> $SP_CSH - echo "set ARCH = `$SGE_ROOT/util/arch`" >> $SP_CSH --echo "set DEFAULTMANPATH = `$SGE_ROOT/util/arch -m`" >> $SP_CSH --echo "set MANTYPE = `$SGE_ROOT/util/arch -mt`" >> $SP_CSH - echo "" >> $SP_CSH - - #if [ "$SGE_CELL" != "" -a "$SGE_CELL" != "default" ]; then -@@ -93,31 +91,9 @@ fi - - - echo "" >> $SP_CSH --echo '# library path setting required only for architectures where RUNPATH is not supported' >> $SP_CSH --echo 'if ( $?MANPATH == 1 ) then' >> $SP_CSH --echo " setenv MANPATH $SGE_ROOT/"'${MANTYPE}':'$MANPATH' >> $SP_CSH --echo "else" >> $SP_CSH --echo " setenv MANPATH $SGE_ROOT/"'${MANTYPE}:$DEFAULTMANPATH' >> $SP_CSH --echo "endif" >> $SP_CSH --echo "" >> $SP_CSH - echo "set path = ( $SGE_ROOT/bin/"'$ARCH $path )' >> $SP_CSH - --echo 'switch ($ARCH)' >> $SP_CSH --#ENFORCE_SHLIBPATH#echo 'case "sol*":' >> $SP_CSH --#ENFORCE_SHLIBPATH#echo 'case "linux-*":' >> $SP_CSH --#ENFORCE_SHLIBPATH#echo 'case "hp11-64":' >> $SP_CSH --#ENFORCE_SHLIBPATH#echo ' breaksw' >> $SP_CSH --echo 'case "*":' >> $SP_CSH --echo " set shlib_path_name = `$SGE_ROOT/util/arch -lib`" >> $SP_CSH --echo " if ( `eval echo '$?'$shlib_path_name` ) then" >> $SP_CSH --echo " set old_value = `eval echo '$'$shlib_path_name`" >> $SP_CSH --echo " setenv $shlib_path_name "$SGE_ROOT/lib/$ARCH":"$old_value"" >> $SP_CSH --echo " else" >> $SP_CSH --echo " setenv $shlib_path_name $SGE_ROOT/lib/$ARCH" >> $SP_CSH --echo " endif" >> $SP_CSH --echo " unset shlib_path_name old_value" >> $SP_CSH --echo "endsw" >> $SP_CSH --echo "unset ARCH DEFAULTMANPATH MANTYPE" >> $SP_CSH -+echo "unset ARCH" >> $SP_CSH - - # - # bourne shell settings file -@@ -126,8 +102,6 @@ echo "unset ARCH DEFAULTMANPATH MANTYPE" - echo "SGE_ROOT=$SGE_ROOT; export SGE_ROOT" > $SP_SH - echo "" >> $SP_SH - echo "ARCH=`$SGE_ROOT/util/arch`" >> $SP_SH --echo "DEFAULTMANPATH=`$SGE_ROOT/util/arch -m`" >> $SP_SH --echo "MANTYPE=`$SGE_ROOT/util/arch -mt`" >> $SP_SH - echo "" >> $SP_SH - - if [ "$SGE_CELL" != "" ]; then -@@ -151,28 +125,7 @@ fi - - - echo "" >> $SP_SH --echo "if [ "$MANPATH" = "" ]; then" >> $SP_SH --echo " MANPATH=$DEFAULTMANPATH" >> $SP_SH --echo "fi" >> $SP_SH --echo "MANPATH=$SGE_ROOT/$MANTYPE:$MANPATH; export MANPATH" >> $SP_SH --echo "" >> $SP_SH - echo "PATH=$SGE_ROOT/bin/$ARCH:$PATH; export PATH" >> $SP_SH - --echo '# library path setting required only for architectures where RUNPATH is not supported' >> $SP_SH --echo 'case $ARCH in' >> $SP_SH --#ENFORCE_SHLIBPATH#echo 'sol*|linux-*|hp11-64)' >> $SP_SH --#ENFORCE_SHLIBPATH#echo ' ;;' >> $SP_SH --echo '*)' >> $SP_SH --echo " shlib_path_name=`$SGE_ROOT/util/arch -lib`" >> $SP_SH --echo " old_value=`eval echo '$'$shlib_path_name`" >> $SP_SH --echo " if [ x$old_value = "x" ]; then" >> $SP_SH --echo " eval $shlib_path_name=$SGE_ROOT/lib/$ARCH" >> $SP_SH --echo " else" >> $SP_SH --echo " eval $shlib_path_name=$SGE_ROOT/lib/$ARCH:$old_value" >> $SP_SH --echo " fi" >> $SP_SH --echo " export $shlib_path_name" >> $SP_SH --echo ' unset shlib_path_name old_value' >> $SP_SH --echo ' ;;' >> $SP_SH --echo 'esac' >> $SP_SH --echo "unset ARCH DEFAULTMANPATH MANTYPE" >> $SP_SH -+echo "unset ARCH" >> $SP_SH - -diff -up GE2011.11p1/source/dist/util/install_modules/inst_common.sh.rctemplates GE2011.11p1/source/dist/util/install_modules/inst_common.sh ---- GE2011.11p1/source/dist/util/install_modules/inst_common.sh.rctemplates 2012-07-09 14:11:10.565925359 -0600 -+++ GE2011.11p1/source/dist/util/install_modules/inst_common.sh 2012-07-09 14:11:10.650922330 -0600 -@@ -576,19 +576,16 @@ ErrUsage() - # - GetConfigFromFile() - { -- SGE_ENABLE_SMF_LAST=$SGE_ENABLE_SMF -- SGE_ENABLE_SMF="" -+ SGE_ENABLE_SMF_LAST=$SGE_ENABLE_SMF -+ SGE_ENABLE_SMF="" -+ -+ if [ $FILE != "undef" ]; then -+ $INFOTEXT "Reading configuration from file %s" $FILE -+ . $FILE -+ else -+ $INFOTEXT "No config file. Please, start the installation with\n a valid configuration file" -+ fi - -- IFS=" --" -- if [ $FILE != "undef" ]; then -- $INFOTEXT "Reading configuration from file %s" $FILE -- . $FILE -- else -- $INFOTEXT "No config file. Please, start the installation with\n a valid configuration file" -- fi -- IFS=" --" - #-nosmf takes precedence over the value in the autoinstall template - if [ "$SGE_ENABLE_SMF_LAST" = false ]; then - SGE_ENABLE_SMF=false -@@ -2373,20 +2370,28 @@ CreateSGEStartUpScripts() - - rm -f $TMP_SGE_STARTUP_FILE ${TMP_SGE_STARTUP_FILE}.0 ${TMP_SGE_STARTUP_FILE}.1 - -- if [ $euid = 0 -a "$ADMINUSER" != default -a $QMASTER = "install" -a $hosttype = "master" ]; then -- AddDefaultManager root $ADMINUSER -- AddDefaultOperator $ADMINUSER -- elif [ $euid != 0 -a $hosttype = "master" ]; then -- AddDefaultManager $USER -- AddDefaultOperator $USER -- fi -- - $INFOTEXT "Creating >%s< script" $STARTUP_FILE_NAME - fi - - } - - -+#------------------------------------------------------------------------- -+# SetupDefaultUsers: Add the default manager and operator -+# -+SetupDefaultUsers() { -+ euid=$1 -+ -+ if [ $euid = 0 -a "$ADMINUSER" != default -a $QMASTER = "install" ]; then -+ AddDefaultManager root $ADMINUSER -+ AddDefaultOperator $ADMINUSER -+ elif [ $euid != 0 ]; then -+ AddDefaultManager $USER -+ AddDefaultOperator $USER -+ fi -+} -+ -+ - #------------------------------------------------------------------------- - # AddSGEStartUpScript: Add startup script to rc files if root installs - # -diff -up GE2011.11p1/source/dist/util/install_modules/inst_execd.sh.rctemplates GE2011.11p1/source/dist/util/install_modules/inst_execd.sh ---- GE2011.11p1/source/dist/util/install_modules/inst_execd.sh.rctemplates 2012-07-09 14:11:10.574925038 -0600 -+++ GE2011.11p1/source/dist/util/install_modules/inst_execd.sh 2012-07-09 14:11:10.651922294 -0600 -@@ -457,7 +457,7 @@ StartExecd() - exit 1 - fi - else -- $SGE_STARTUP_FILE -+ /sbin/service sge_execd start - fi - $INFOTEXT -wait -auto $AUTO -n "\nHit <RETURN> to continue >> " - $CLEAR -diff -up GE2011.11p1/source/dist/util/install_modules/inst_qmaster.sh.rctemplates GE2011.11p1/source/dist/util/install_modules/inst_qmaster.sh ---- GE2011.11p1/source/dist/util/install_modules/inst_qmaster.sh.rctemplates 2012-07-09 14:11:10.597924218 -0600 -+++ GE2011.11p1/source/dist/util/install_modules/inst_qmaster.sh 2012-07-09 14:11:10.653922222 -0600 -@@ -208,8 +208,8 @@ GetQmasterSpoolDir() - "the qmaster daemon on other hosts (see the corresponding section in the\n" \ - "Grid Engine Installation and Administration Manual for details) the account\n" \ - "on the shadow master hosts also needs read/write access to this directory.\n\n" \ -- "Enter a qmaster spool directory [%s] >> " "$SGE_ROOT_VAL/$SGE_CELL_VAL/spool/qmaster" -- QMDIR=`Enter "$SGE_ROOT_VAL/$SGE_CELL_VAL/spool/qmaster"` -+ "Enter a qmaster spool directory [%s] >> " "/var/spool/gridengine/$SGE_CELL_VAL/spool/qmaster" -+ QMDIR=`Enter "/var/spool/gridengine/$SGE_CELL_VAL/spool/qmaster"` - done=true - #If directory is not empty need now require a new one - if [ -d "$QMDIR" ]; then -@@ -747,6 +747,9 @@ AddBootstrap() - ExecuteAsAdmin chmod 666 $COMMONDIR/bootstrap - PrintBootstrap >> $COMMONDIR/bootstrap - ExecuteAsAdmin chmod 444 $COMMONDIR/bootstrap -+ rm -f /etc/sysconfig/gridengine -+ echo "SGE_ROOT=/usr/share/gridengine" >> /etc/sysconfig/gridengine -+ echo "SGE_CELL=$SGE_CELL" >> /etc/sysconfig/gridengine - } - - #------------------------------------------------------------------------- -@@ -963,7 +966,7 @@ GetConfiguration() - fi - - if [ -z "$1" ]; then -- default_value=$SGE_ROOT_VAL/$SGE_CELL_VAL/spool -+ default_value=/var/spool/gridengine/$SGE_CELL_VAL - else - default_value="$1" - fi -@@ -1206,6 +1209,7 @@ InitSysKs() - touch /tmp/pwfile.$$ - chmod 600 /tmp/pwfile.$$ - echo "$SGE_JMX_SSL_KEYSTORE_PW" > /tmp/pwfile.$$ -+ ExecuteAsAdmin mkdir -p `dirname $SGE_JMX_SSL_KEYSTORE` - OUTPUT=`$SGE_CA_CMD -sysks -ksout $SGE_JMX_SSL_KEYSTORE -kspwf /tmp/pwfile.$$ 2>&1` - if [ $? != 0 ]; then - $INFOTEXT "Error: Cannot create keystore $SGE_JMX_SSL_KEYSTORE\n$OUTPUT" -@@ -1277,7 +1281,7 @@ StartQmaster() - exit 1 - fi - else -- $SGE_STARTUP_FILE -qmaster -+ /sbin/service sgemaster start - if [ $? -ne 0 ]; then - $INFOTEXT "sge_qmaster start problem" - $INFOTEXT -log "sge_qmaster start problem" -diff -up GE2011.11p1/source/scripts/distinst.rctemplates GE2011.11p1/source/scripts/distinst ---- GE2011.11p1/source/scripts/distinst.rctemplates 2012-05-23 13:04:39.000000000 -0600 -+++ GE2011.11p1/source/scripts/distinst 2012-07-09 14:11:10.655922152 -0600 -@@ -839,15 +839,9 @@ if [ $instcommon = true ]; then - Execute cp libs/jgdi/util/logging.properties.template $DEST_SGE_ROOT/util - if [ $enforce_shlibpath = true ]; then - Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/create_settings.sh > $DEST_SGE_ROOT/util/create_settings.sh -- Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgemaster_template > $DEST_SGE_ROOT/util/rctemplates/sgemaster_template -- Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgeexecd_template > $DEST_SGE_ROOT/util/rctemplates/sgeexecd_template -- Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgebdb_template > $DEST_SGE_ROOT/util/rctemplates/sgebdb_template - Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/install_modules/inst_common.sh > $DEST_SGE_ROOT/util/install_modules/inst_common.sh - else - Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/create_settings.sh > $DEST_SGE_ROOT/util/create_settings.sh -- Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgemaster_template > $DEST_SGE_ROOT/util/rctemplates/sgemaster_template -- Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgeexecd_template > $DEST_SGE_ROOT/util/rctemplates/sgeexecd_template -- Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgebdb_template > $DEST_SGE_ROOT/util/rctemplates/sgebdb_template - Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/install_modules/inst_common.sh > $DEST_SGE_ROOT/util/install_modules/inst_common.sh - fi - -@@ -872,7 +866,6 @@ if [ $instcommon = true ]; then - - Execute chmod 755 $DEST_SGE_ROOT/util/install_modules \ - $DEST_SGE_ROOT/util/upgrade_modules \ -- $DEST_SGE_ROOT/util/rctemplates \ - $DEST_SGE_ROOT/util/resources \ - $DEST_SGE_ROOT/util/sgeCA \ - $DEST_SGE_ROOT/util/resources/calendars \ -@@ -897,7 +890,6 @@ if [ $instcommon = true ]; then - $DEST_SGE_ROOT/util/resources/starter_methods/* - - Execute chmod 644 $DEST_SGE_ROOT/util/install_modules/* \ -- $DEST_SGE_ROOT/util/rctemplates/* \ - $DEST_SGE_ROOT/util/sgeCA/*.cnf \ - $DEST_SGE_ROOT/util/sgeSMF/*.xml \ - $DEST_SGE_ROOT/util/sgeSMF/sge_smf_support.sh \ ---- GE2011.11p1/source/dist/util/install_modules/inst_execd_uninst.sh.rctemplates 2012-05-23 13:04:48.000000000 -0600 -+++ GE2011.11p1/source/dist/util/install_modules/inst_execd_uninst.sh 2012-07-09 16:50:24.230166313 -0600 -@@ -281,11 +281,6 @@ - $INFOTEXT "Removing spool directory [%s]" $SPOOL_DIR/$HOST_DIR - $INFOTEXT -log "Removing spool directory [%s]" $SPOOL_DIR/$HOST_DIR - ExecuteAsAdmin rm -R $SPOOL_DIR/$HOST_DIR
arch-excludes@lists.fedoraproject.org