[28839] in Source-Commits
moira commit [debian]: Fix all uses of sqlglm() to use size_t * parameters. (The use in server/qrtn.pc was fixed in 2010.)
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Wed Apr 25 23:50:08 2018
Date: Wed, 25 Apr 2018 23:49:53 -0400
From: Anders Kaseorg <andersk@mit.edu>
Message-Id: <201804260349.w3Q3nrcq024798@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/moira/commit/9bf7b99de9d1af90302575b22e42560fb83797de
commit 9bf7b99de9d1af90302575b22e42560fb83797de
Author: Greg Hudson <ghudson@mit.edu>
Date: Mon Oct 24 11:58:20 2016 -0400
Fix all uses of sqlglm() to use size_t * parameters. (The use in server/qrtn.pc was fixed in 2010.)
moira/afssync/sync.pc | 2 +-
moira/backup/dumprest.pc | 4 ++--
moira/dbck/dbck.pc | 4 ++--
moira/dcm/dcm.pc | 4 ++--
moira/gen/util.c | 4 ++--
moira/incremental/incr-runner/incr-runner.pc | 4 ++--
moira/reg_svr/reg_svr.pc | 2 +-
moira/regtape/common.pc | 4 ++--
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/moira/afssync/sync.pc b/moira/afssync/sync.pc
index 6761e00..9a2db9c 100644
--- a/moira/afssync/sync.pc
+++ b/moira/afssync/sync.pc
@@ -305,7 +305,7 @@ void do_groups(void)
void sqlerr(void)
{
char buf[256];
- int size=256, len=0;
+ size_t size=256, len=0;
sqlglm(buf, &size, &len);
buf[len]='\0';
diff --git a/moira/backup/dumprest.pc b/moira/backup/dumprest.pc
index 1ba10fa..54c52a4 100644
--- a/moira/backup/dumprest.pc
+++ b/moira/backup/dumprest.pc
@@ -13,7 +13,7 @@
RCSID("$HeadURL$ $Id$");
-extern void sqlglm(char *, unsigned int *, unsigned int *);
+extern void sqlglm(char *, size_t *, size_t *);
void punt(char *msg)
{
@@ -26,7 +26,7 @@ void dbmserr(void)
EXEC SQL BEGIN DECLARE SECTION;
char err_msg[256];
EXEC SQL END DECLARE SECTION;
- int bufsize = 256, msglength = 0;
+ size_t bufsize = 256, msglength = 0;
sqlglm(err_msg, &bufsize, &msglength);
err_msg[msglength] = '\0';
diff --git a/moira/dbck/dbck.pc b/moira/dbck/dbck.pc
index 034024f..c25b543 100644
--- a/moira/dbck/dbck.pc
+++ b/moira/dbck/dbck.pc
@@ -36,7 +36,7 @@ SQLDA *mr_sqlda;
void interrupt(int signal);
extern SQLDA *sqlald(int, int, int);
-extern void sqlglm(char *, unsigned int *, unsigned int *);
+extern void sqlglm(char *, size_t *, size_t *);
int main(int argc, char **argv)
{
@@ -141,7 +141,7 @@ void dbmserr(void)
EXEC SQL BEGIN DECLARE SECTION;
char buf[256];
EXEC SQL END DECLARE SECTION;
- int bufsize = 256, msglength = 0;
+ size_t bufsize = 256, msglength = 0;
if (sqlca.sqlcode == 1403)
return;
diff --git a/moira/dcm/dcm.pc b/moira/dcm/dcm.pc
index 418b80f..229de6c 100644
--- a/moira/dcm/dcm.pc
+++ b/moira/dcm/dcm.pc
@@ -25,7 +25,7 @@
#include <unistd.h>
EXEC SQL INCLUDE sqlca;
-void sqlglm(char *, unsigned int *, unsigned int *);
+void sqlglm(char *, size_t *, size_t *);
RCSID("$HeadURL$ $Id$");
@@ -558,7 +558,7 @@ void dbmserr(void)
EXEC SQL BEGIN DECLARE SECTION;
char err_msg[256];
EXEC SQL END DECLARE SECTION;
- int bufsize = 256, msglength = 0;
+ size_t bufsize = 256, msglength = 0;
sqlglm(err_msg, &bufsize, &msglength);
err_msg[msglength] = '\0';
diff --git a/moira/gen/util.c b/moira/gen/util.c
index eda9f15..c693205 100644
--- a/moira/gen/util.c
+++ b/moira/gen/util.c
@@ -21,7 +21,7 @@ RCSID("$HeadURL$ $Id$");
/* Julian day of the UNIX epoch (January 1, 1970) */
#define UNIX_EPOCH 2440588
-extern void sqlglm(char buf[], int *, int *);
+extern void sqlglm(char buf[], size_t *, size_t *);
void fix_file(char *targetfile)
{
@@ -87,7 +87,7 @@ void db_error(int code)
{
extern char *whoami;
char buf[256];
- int bufsize = 256, len = 0;
+ size_t bufsize = 256, len = 0;
if (code == -1013)
{
diff --git a/moira/incremental/incr-runner/incr-runner.pc b/moira/incremental/incr-runner/incr-runner.pc
index 6a48a28..7f2894b 100644
--- a/moira/incremental/incr-runner/incr-runner.pc
+++ b/moira/incremental/incr-runner/incr-runner.pc
@@ -30,7 +30,7 @@
#define INC_TIMEOUT (3 * 60) /* 3 minutes */
EXEC SQL INCLUDE sqlca;
-void sqlglm(char *, unsigned int *, unsigned int *);
+void sqlglm(char *, size_t *, size_t *);
void dbmserr(void);
void *xmalloc(size_t);
void do_service(char *name);
@@ -310,7 +310,7 @@ void dbmserr(void)
EXEC SQL BEGIN DECLARE SECTION;
char err_msg[256];
EXEC SQL END DECLARE SECTION;
- int bufsize = 256, msglength = 0;
+ size_t bufsize = 256, msglength = 0;
sqlglm(err_msg, &bufsize, &msglength);
err_msg[msglength] = '\0';
diff --git a/moira/reg_svr/reg_svr.pc b/moira/reg_svr/reg_svr.pc
index 4929b98..57a5415 100644
--- a/moira/reg_svr/reg_svr.pc
+++ b/moira/reg_svr/reg_svr.pc
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
if (sqlca.sqlcode)
{
char err_msg[256];
- int bufsize = 256, msglength = 0;
+ size_t bufsize = 256, msglength = 0;
sqlglm(err_msg, &bufsize, &msglength);
err_msg[msglength] = 0;
diff --git a/moira/regtape/common.pc b/moira/regtape/common.pc
index 3ad850a..c5d938a 100644
--- a/moira/regtape/common.pc
+++ b/moira/regtape/common.pc
@@ -18,7 +18,7 @@
#include <stdio.h>
EXEC SQL INCLUDE sqlca;
-extern void sqlglm(char *, unsigned int *, unsigned int *);
+extern void sqlglm(char *, size_t *, size_t *);
RCSID("$HeadURL$ $Id$");
@@ -504,7 +504,7 @@ void sqlexit(void)
void dbmserr(char *where, int what)
{
char err_msg[256];
- int bufsize = 256, msglength = 0;
+ size_t bufsize = 256, msglength = 0;
sqlglm(err_msg, &bufsize, &msglength);
err_msg[msglength] = '\0';
