Skip to content
Snippets Groups Projects
Commit f36e66e6 authored by Moe Jette's avatar Moe Jette
Browse files

Fix some bad pointers.

parent 47192e68
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* provides interface to read, write, update, and configurations. * provides interface to read, write, update, and configurations.
* $Id$ * $Id$
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 The Regents of the University of California. * Copyright (C) 2002-2006 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> * Written by Morris Jette <jette1@llnl.gov>
* UCRL-CODE-217948. * UCRL-CODE-217948.
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
#include "src/common/hostlist.h" #include "src/common/hostlist.h"
#include "src/common/log.h" #include "src/common/log.h"
#include "src/common/node_select.h"
#include "src/common/parse_spec.h" #include "src/common/parse_spec.h"
#include "src/common/parse_time.h" #include "src/common/parse_time.h"
#include "src/common/read_config.h" #include "src/common/read_config.h"
...@@ -1555,13 +1556,13 @@ _update_job (int argc, char *argv[]) ...@@ -1555,13 +1556,13 @@ _update_job (int argc, char *argv[])
exit_code = 1; exit_code = 1;
} else } else
update_cnt++; update_cnt++;
select_g_set_jobinfo(&job_msg.select_jobinfo, select_g_set_jobinfo(job_msg.select_jobinfo,
SELECT_DATA_GEOMETRY, SELECT_DATA_GEOMETRY,
geo); (void *) &geo);
} }
else if (strncasecmp(argv[i], "Rotate=", 7) == 0) { else if (strncasecmp(argv[i], "Rotate=", 7) == 0) {
int16_t rotate; uint16_t rotate;
if (strcasecmp(&argv[i][7], "yes") == 0) if (strcasecmp(&argv[i][7], "yes") == 0)
rotate = 1; rotate = 1;
else if (strcasecmp(&argv[i][7], "no") == 0) else if (strcasecmp(&argv[i][7], "no") == 0)
...@@ -1569,13 +1570,13 @@ _update_job (int argc, char *argv[]) ...@@ -1569,13 +1570,13 @@ _update_job (int argc, char *argv[])
else else
rotate = (uint16_t) strtol(&argv[i][7], rotate = (uint16_t) strtol(&argv[i][7],
(char **) NULL, 10); (char **) NULL, 10);
select_g_set_jobinfo(&job_msg.select_jobinfo, select_g_set_jobinfo(job_msg.select_jobinfo,
SELECT_DATA_ROTATE, SELECT_DATA_ROTATE,
rotate); (void *) &rotate);
update_cnt++; update_cnt++;
} }
else if (strncasecmp(argv[i], "Connection=", 11) == 0) { else if (strncasecmp(argv[i], "Connection=", 11) == 0) {
int16_t conn_type; uint16_t conn_type;
if (strcasecmp(&argv[i][11], "torus") == 0) if (strcasecmp(&argv[i][11], "torus") == 0)
conn_type = SELECT_TORUS; conn_type = SELECT_TORUS;
else if (strcasecmp(&argv[i][11], "mesh") == 0) else if (strcasecmp(&argv[i][11], "mesh") == 0)
...@@ -1586,9 +1587,9 @@ _update_job (int argc, char *argv[]) ...@@ -1586,9 +1587,9 @@ _update_job (int argc, char *argv[])
conn_type = conn_type =
(uint16_t) strtol(&argv[i][11], (uint16_t) strtol(&argv[i][11],
(char **) NULL, 10); (char **) NULL, 10);
select_g_set_jobinfo(&job_msg.select_jobinfo, select_g_set_jobinfo(job_msg.select_jobinfo,
SELECT_DATA_CONN_TYPE, SELECT_DATA_CONN_TYPE,
conn_type); (void *) &conn_type);
update_cnt++; update_cnt++;
} }
#endif #endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment