Skip to content

Commit

Permalink
Address errors from gcc 8 with -Wall -Werror
Browse files Browse the repository at this point in the history
  • Loading branch information
@mike0042
mike0042 committed Oct 17, 2018
1 parent 5408e47 commit 94444ae
Show file tree
Hide file tree
Showing 73 changed files with 1,723 additions and 1,443 deletions.
45 changes: 17 additions & 28 deletions m4/with_libical.m4
View file
Expand Up @@ -48,18 +48,26 @@ AC_DEFUN([PBS_AC_WITH_LIBICAL],
libical_dir=["/usr"]
)
AC_MSG_CHECKING([for libical])
AS_IF([test -r "$libical_dir/include/ical.h"],
AS_IF([test "$libical_dir" != "/usr"],
[libical_inc="-I$libical_dir/include"]),
AS_IF([test -r "$libical_dir/include/libical/ical.h"],
[libical_inc="-I$libical_dir/include/libical"],
AC_MSG_ERROR([libical headers not found.])))
AS_IF([test -r "$libical_dir/include/libical/ical.h"],
[libical_include="$libical_dir/include"],
AC_MSG_ERROR([libical headers not found.])
)
libical_version=`$SED -n 's/^#define ICAL_VERSION "\([[0-9]]*\)..*/\1/p' "$libical_include/libical/ical.h"`
AS_IF([test "x$libical_version" = "x"],
AC_MSG_ERROR([Could not determine libical version.])
)
AS_IF([test $libical_version -gt 1],
AC_DEFINE([LIBICAL_API2], [], [Defined when libical version >= 2])
)
AS_IF([test "$libical_dir" = "/usr"],
# Using system installed libical
dnl Using system installed libical
libical_inc=""
AS_IF([test -r "/usr/lib64/libical.so" -o -r "/usr/lib/libical.so" -o -r "/usr/lib/x86_64-linux-gnu/libical.so"],
[libical_lib="-lical"],
AC_MSG_ERROR([libical shared object library not found.])),
# Using developer installed libical
AC_MSG_ERROR([libical shared object library not found.])
),
dnl Using developer installed libical
libical_inc="-I$libical_include"
AS_IF([test -r "${libical_dir}/lib64/libical.a"],
[libical_lib="${libical_dir}/lib64/libical.a"],
AS_IF([test -r "${libical_dir}/lib/libical.a"],
Expand All @@ -72,23 +80,4 @@ AC_DEFUN([PBS_AC_WITH_LIBICAL],
AC_SUBST(libical_inc)
AC_SUBST(libical_lib)
AC_DEFINE([LIBICAL], [], [Defined when libical is available])
version2_check="yes"
AS_IF([test "x$with_libical" != "x"],
AS_IF([test -r "${libical_dir}/lib/pkgconfig/libical.pc"],
export PKG_CONFIG_PATH=["${libical_dir}/lib/pkgconfig/:$PKG_CONFIG_PATH"],
AS_IF([test -r "${libical_dir}/lib64/pkgconfig/libical.pc"],
export PKG_CONFIG_PATH=["${libical_dir}/lib64/pkgconfig/:$PKG_CONFIG_PATH"],
version2_check="no"
AC_MSG_WARN([libical.pc file not found.])
)
)
)
AS_IF([test "x$version2_check" = "yes"],
[PKG_CHECK_MODULES([libical_api2],
[libical >= 2],
[AC_DEFINE([LIBICAL_API2], [], [Defined when libical version >= 2])],
[echo "libical version 2 is not available"]
)]
)
])

28 changes: 18 additions & 10 deletions src/cmds/pbs_ds_password.c
View file
Expand Up @@ -116,6 +116,10 @@
#include <ctype.h>
#endif

#ifndef LOGIN_NAME_MAX
#define LOGIN_NAME_MAX 256
#endif


int cred_type;
size_t cred_len;
Expand Down Expand Up @@ -254,13 +258,14 @@ read_password(char *passwd)
static int
gen_password(char *passwd, int len)
{
int chrs = 0, c;
int chrs = 0;
char allowed_chars[] = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()_+";
int arr_len = strlen(allowed_chars);

sleep(1); /* sleep 1 second to ensure the srand on time(0) truely randomizes the seed */
srand(time(0));
while (chrs < len) {
int c;
c = (char)(rand() % arr_len);
passwd[chrs++] = allowed_chars[c];
}
Expand Down Expand Up @@ -400,20 +405,18 @@ int
main(int argc, char *argv[])
{
int i, rc;
char passwd[MAX_PASSWORD_LEN+1];
char passwd2[MAX_PASSWORD_LEN+1];
char passwd[MAX_PASSWORD_LEN + 1];
char passwd2[MAX_PASSWORD_LEN + 1];
char *pquoted;
char pwd_file[MAXPATHLEN+1];
char usr_file[MAXPATHLEN+1];
char userid[MAXPATHLEN+1];
char pwd_file[MAXPATHLEN + 1];
char userid[LOGIN_NAME_MAX + 1];
int fd, errflg = 0;
int gen_pwd = 0;
char sqlbuff[1024];
int db_conn_error=0;
char *db_errmsg = NULL;
int pmode;
int change_user = 0;
char datastore[MAXPATHLEN+1];
char *olduser;
int update_db = 0;
char getopt_format[5];
Expand Down Expand Up @@ -619,15 +622,18 @@ main(int argc, char *argv[])

if (change_user == 1) {
/* check whether user exists */
sprintf(sqlbuff, "select usename from pg_user where usename = '%s'",
snprintf(sqlbuff, sizeof(sqlbuff),
"select usename from pg_user where usename = '%s'",
userid);
if (pbs_db_execute_str(conn, sqlbuff) == 1) {
/* now attempt to create new user & set the database passwd to the un-encrypted password */
sprintf(sqlbuff, "create user \"%s\" SUPERUSER ENCRYPTED PASSWORD '%s'",
snprintf(sqlbuff, sizeof(sqlbuff),
"create user \"%s\" SUPERUSER ENCRYPTED PASSWORD '%s'",
userid, pquoted);
} else {
/* attempt to alter new user & set the database passwd to the un-encrypted password */
sprintf(sqlbuff, "alter user \"%s\" SUPERUSER ENCRYPTED PASSWORD '%s'",
snprintf(sqlbuff, sizeof(sqlbuff),
"alter user \"%s\" SUPERUSER ENCRYPTED PASSWORD '%s'",
userid, pquoted);
}
memset(passwd, 0, sizeof(passwd));
Expand Down Expand Up @@ -698,6 +704,7 @@ main(int argc, char *argv[])
}

if (change_user == 1) {
char usr_file[MAXPATHLEN + 1];
#ifdef WIN32
sprintf(usr_file, "%s\\server_priv\\db_user", pbs_conf.pbs_home_path);
#else
Expand All @@ -712,6 +719,7 @@ main(int argc, char *argv[])
}

if (update_db == 1 && change_user == 1) {
char datastore[MAXPATHLEN + 1];
#ifndef WIN32
/* ownership is changed only for Unix users
* On windows, these files are allways owned by the user who installed the database
Expand Down
3 changes: 1 addition & 2 deletions src/cmds/pbs_release_nodes.c
View file
Expand Up @@ -50,11 +50,10 @@
#include <pbs_config.h> /* the master config generated by configure */
#include <pbs_version.h>

const static char ident[] = "@(#) $RCSfile: pbs_release_nodes.c,v $ $Revision: #1 $";

#define USAGE "usage: pbs_release_nodes [-j job_identifier] host_or_vnode1 host_or_vnode2 ...\n"
#define USAGE2 "usage: pbs_release_nodes [-j job_identifier] -a\n"
#define USAGE3 " pbs_release_nodes --version\n"

int
main(int argc, char **argv, char **envp) /* pbs_release_nodes */
{
Expand Down
92 changes: 48 additions & 44 deletions src/cmds/pbsnodes.c
View file
Expand Up @@ -307,14 +307,6 @@ prt_node_summary(char *def_server, struct batch_status *bstatus, int job_summary
struct attrl *pattr;
struct attrl *next;
struct JsonNode *node = NULL;
char *name;
char *state;
char *hardware;
char *queue;
char *os;
char *host;
char *comment;
char *jobs;
char suffixletter[] = " kmgtp?";
char *pc;
char *pc1;
Expand All @@ -324,23 +316,11 @@ prt_node_summary(char *def_server, struct batch_status *bstatus, int job_summary
char ngpus_info[20] = "0";
char *prev_jobid = NULL;
char *cur_jobid = NULL;
int prefix_total = 0;
int prefix_available = 0; /*magnitude of value when printed*/
int prefix_assigned = 0;
int count = 0;
long int assigned_mem = 0;
long int available_mem = 0;
long int total_mem = 0;
long int available_cpus = 0;
long int total_cpus = 0;
long int njobs = 0;
long int run_jobs = 0;
long int susp_jobs = 0;
long int total_nmic = 0;
long int available_nmic = 0;
long int total_ngpus = 0;
long int available_ngpus = 0;
long int resource_assigned = 0;
long int value = 0;
static int done_headers = 0;

Expand All @@ -359,45 +339,67 @@ prt_node_summary(char *def_server, struct batch_status *bstatus, int job_summary
def_server = "";

for (bstat = bstatus; bstat; bstat = bstat->next) {
name = "--";
char *name;
char *state;
char *hardware;
char *queue;
char *os;
char *host;
char *comment;
char *jobs;
int count;
int prefix_total;
int prefix_available; /* magnitude of value when printed */
long int total_mem;
long int available_mem;
long int total_cpus;
long int available_cpus;
long int total_nmic;
long int available_nmic;
long int total_ngpus;
long int available_ngpus;
long int resource_assigned;

name = bstat->name;
state = "--";
hardware = "--";
queue = "--";
os = "--";
host = "--";
comment = "--";
jobs ="--";
pc = NULL;
if (job_summary) {
strcpy(mem_info, "0kb/0kb");
strcpy(ncpus_info, "0/0");
strcpy(nmic_info, "0/0");
strcpy(ngpus_info, "0/0");
} else {
strcpy(mem_info, "0kb");
strcpy(ncpus_info, "0");
strcpy(nmic_info, "0");
strcpy(ngpus_info, "0");
}
count = 0;
prefix_total = 0;
prefix_available = 0;
count = 0;
available_mem = 0;
total_mem = 0;
available_cpus = 0;
available_mem = 0;
total_cpus = 0;
njobs = 0;
run_jobs = 0;
susp_jobs = 0;
available_cpus = 0;
total_nmic = 0;
available_nmic = 0;
total_ngpus = 0;
available_ngpus = 0;
resource_assigned = 0;
njobs = 0;
run_jobs = 0;
susp_jobs = 0;
value = 0;
prev_jobid = "";
cur_jobid = "";
name = bstat->name;
pc = NULL;

if (job_summary) {
strcpy(mem_info, "0kb/0kb");
strcpy(ncpus_info, "0/0");
strcpy(nmic_info, "0/0");
strcpy(ngpus_info, "0/0");
} else {
strcpy(mem_info, "0kb");
strcpy(ncpus_info, "0");
strcpy(nmic_info, "0");
strcpy(ngpus_info, "0");
}

for (pattr = bstat->attribs; pattr; pattr = pattr->next) {
if (pattr->resource && (strcmp(pattr->name, "resources_assigned") != 0)) {
if ((strcmp(pattr->resource, "mem") == 0)) {
Expand Down Expand Up @@ -441,10 +443,10 @@ prt_node_summary(char *def_server, struct batch_status *bstatus, int job_summary
prefix_total++;
}
if (job_summary)
snprintf(mem_info, 20, "%ld%cb/%ld%cb", available_mem, suffixletter[prefix_available],
snprintf(mem_info, sizeof(mem_info), "%ld%cb/%ld%cb", available_mem, suffixletter[prefix_available],
total_mem, suffixletter[prefix_total]);
else
snprintf(mem_info, 20, "%ld%cb", total_mem, suffixletter[prefix_total]);
snprintf(mem_info, sizeof(mem_info), "%ld%cb", total_mem, suffixletter[prefix_total]);
} else if ((strcmp(pattr->resource, "ncpus") == 0)) {
total_cpus = atol(pattr->value);
resource_assigned = 0;
Expand Down Expand Up @@ -816,7 +818,6 @@ marknode(int con, char *name,
char *state2, enum batch_op op2,
char *comment)
{
char *errmsg;
char Comment[80];
struct attropl new[3];
int i;
Expand Down Expand Up @@ -857,6 +858,8 @@ marknode(int con, char *name,

rc = pbs_manager(con, MGR_CMD_SET, MGR_OBJ_HOST, name, new, NULL);
if (rc && !quiet) {
char *errmsg;

fprintf(stderr, "Error marking node %s - ", name);
if ((errmsg = pbs_geterrmsg(con)) != NULL)
fprintf(stderr, "%s\n", errmsg);
Expand Down Expand Up @@ -901,7 +904,6 @@ main(int argc, char *argv[])
int long_summary = 0;
int format = 0;
int prt_summary = 0;
int matched = 0;

/*test for real deal or just version and exit*/

Expand Down Expand Up @@ -1283,6 +1285,8 @@ main(int argc, char *argv[])
/*list nodes and vnodes associated with them.*/
if (argc-optind) {
for (bstat = bstat_head; bstat;bstat = bstat->next) {
int matched;

matched = 0;
pa = argv+optind;
while (*pa) {
Expand Down

0 comments on commit 94444ae

Please sign in to comment.