diff options
author | Ian Stakenvicius <axs@gentoo.org> | 2019-02-25 15:32:40 -0500 |
---|---|---|
committer | Ian Stakenvicius <axs@gentoo.org> | 2019-03-07 12:37:39 -0500 |
commit | 26611d6eaebddfe64f6412e5a7c5be2a952e95a4 (patch) | |
tree | b437ec8164796bb16094490c123c3db115c5ff0d /sys-cluster/torque/files | |
parent | dev-db/lmdb: amd64 stable wrt bug #678696 (diff) | |
download | gentoo-26611d6eaebddfe64f6412e5a7c5be2a952e95a4.tar.gz gentoo-26611d6eaebddfe64f6412e5a7c5be2a952e95a4.tar.bz2 gentoo-26611d6eaebddfe64f6412e5a7c5be2a952e95a4.zip |
sys-cluster/torque: updated 4.2.10
Switched the distfile to a snapshot of the latest from 4.2.10 branch in
github, which includes a large number of changes and bug fixes. Also
included a patch to address -fpermissive compilation errors sometimes
experienced with newer toolchains.
Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
Diffstat (limited to 'sys-cluster/torque/files')
-rw-r--r-- | sys-cluster/torque/files/torque-4.2-use-NULL-instead-of-char0.patch | 140 |
1 files changed, 140 insertions, 0 deletions
diff --git a/sys-cluster/torque/files/torque-4.2-use-NULL-instead-of-char0.patch b/sys-cluster/torque/files/torque-4.2-use-NULL-instead-of-char0.patch new file mode 100644 index 000000000000..a1cb85327d71 --- /dev/null +++ b/sys-cluster/torque/files/torque-4.2-use-NULL-instead-of-char0.patch @@ -0,0 +1,140 @@ +--- a/src/cmds/pbsnodes.c 2015-03-17 16:43:36.000000000 -0400 ++++ b/src/cmds/pbsnodes.c 2019-02-25 12:33:37.824638386 -0500 +@@ -693,7 +693,7 @@ + /* -N n is the same as -N "" -- it clears the note */ + + if (!strcmp(note, "n")) +- *note = '\0'; ++ *note = NULL; + + if (strlen(note) > MAX_NOTE) + { +@@ -821,7 +821,7 @@ + { + nodeargs = (char **)calloc(2, sizeof(char **)); + nodeargs[0] = strdup(""); +- nodeargs[1] = '\0'; ++ nodeargs[1] = NULL; + } + } + } +@@ -901,7 +901,7 @@ + + MXMLCreateE(&DE, "Data"); + +- for (lindex = 0;nodeargs[lindex] != '\0';lindex++) ++ for (lindex = 0;nodeargs[lindex] != NULL;lindex++) + { + bstatus = statnode(con, nodeargs[lindex]); + +@@ -922,7 +922,7 @@ + } + else + { +- for (lindex = 0;nodeargs[lindex] != '\0';lindex++) ++ for (lindex = 0;nodeargs[lindex] != NULL;lindex++) + { + bstatus = statnode(con, nodeargs[lindex]); + +@@ -946,7 +946,7 @@ + + /* list any node that is DOWN, OFFLINE, or UNKNOWN */ + +- for (lindex = 0;nodeargs[lindex] != '\0';lindex++) ++ for (lindex = 0;nodeargs[lindex] != NULL;lindex++) + { + bstatus = statnode(con, nodeargs[lindex]); + +--- a/src/cmds/qsub_functions.c 2015-03-17 16:43:36.000000000 -0400 ++++ b/src/cmds/qsub_functions.c 2019-02-25 12:32:00.442982091 -0500 +@@ -542,7 +542,7 @@ + static char tmpLine[65536]; + + /* we've reached the end */ +- if ((start == NULL) && (*tok_ptr == '\0')) ++ if ((start == NULL) && (*tok_ptr == NULL)) + return(0); + + if (start != NULL) +@@ -554,7 +554,7 @@ + return(0); + + if ((*curr_ptr == '=') || +- (*curr_ptr == '\0')) ++ (*curr_ptr == NULL)) + { + /* no name, fail */ + return(-1); +@@ -574,18 +574,18 @@ + + /* strip blanks */ + while ((*equals) && (isspace((int)*equals))) +- *equals++ = '\0'; ++ *equals++ = NULL; + + if (*equals != '=') + return (-1); /* should have found a = as first non blank */ + +- *equals++ = '\0'; ++ *equals++ = NULL; + + /* skip leading white space */ + while (isspace((int)*equals) && *equals) + equals++; + +- if (*equals == '\0') ++ if (*equals == NULL) + return(-1); + + *value = equals; +@@ -872,7 +872,7 @@ + else + { + char *tmp_host = pbs_default(); +- if (tmp_host == '\0') ++ if (tmp_host == NULL) + hash_add_or_exit(mm, job_attr, ATTR_pbs_o_server, qsub_host, LOGIC_DATA); + else + hash_add_or_exit(mm, job_attr, ATTR_pbs_o_server, tmp_host, LOGIC_DATA); +--- a/src/include/attribute.h 2015-03-17 16:43:36.000000000 -0400 ++++ b/src/include/attribute.h 2019-02-22 16:47:40.507695453 -0500 +@@ -445,7 +445,7 @@ + extern int parse_equal_string(char *, char **, char **); + extern char *parse_comma_string(char *,char **); + +-#define NULL_FUNC '\0' ++#define NULL_FUNC NULL + + /* other associated funtions */ + struct dynamic_string; +--- a/src/resmom/mom_main.c 2015-03-17 16:43:36.000000000 -0400 ++++ b/src/resmom/mom_main.c 2019-02-22 14:01:26.573890840 -0500 +@@ -4224,7 +4224,7 @@ + goto done; + } + +- name[i] = '\0'; ++ name[i] = NULL; + + for (d = ret_string, resline++;*resline;) + { +--- a/src/server/job_attr_def.c 2015-03-17 16:43:36.000000000 -0400 ++++ b/src/server/job_attr_def.c 2019-02-22 16:43:05.653007840 -0500 +@@ -1193,7 +1193,7 @@ + }, + + /* JOB_ATR_system_start_time */ +- {ATTR_system_start_time, /* start time as encoded in the proc/pid directory */ ++ { (char *)ATTR_system_start_time, /* start time as encoded in the proc/pid directory */ + decode_l, + encode_l, + set_l, +@@ -1205,7 +1205,7 @@ + PARENT_TYPE_JOB}, + + /* JOB_ATR_nppcu */ +- {ATTR_nppcu, /* how to handle compute units (on Cray system) */ ++ { (char *)ATTR_nppcu, /* how to handle compute units (on Cray system) */ + decode_l, + encode_l, + set_l, |