From 0e8c5028d3fd7f112a45cd394c42ac302af1cebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Thu, 31 Aug 2000 14:49:52 +0200
Subject: [PATCH] Fixed a few warnings.
Rev: src/modules/Odbc/odbc.c:1.20
Rev: src/modules/Odbc/odbc_result.c:1.21
Rev: src/modules/Odbc/precompiled_odbc.h:1.13
Rev: src/modules/_Crypto/lib/idea.c:1.6
Rev: src/modules/files/stat.c:1.12
---
src/modules/Odbc/odbc.c | 13 +++++----
src/modules/Odbc/odbc_result.c | 16 +++++++----
src/modules/Odbc/precompiled_odbc.h | 4 +--
src/modules/_Crypto/lib/idea.c | 6 ++--
src/modules/files/stat.c | 44 ++++++++++++++---------------
5 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/src/modules/Odbc/odbc.c b/src/modules/Odbc/odbc.c
index c93a89a6f1..879cbaa560 100644
--- a/src/modules/Odbc/odbc.c
+++ b/src/modules/Odbc/odbc.c
@@ -1,5 +1,5 @@
/*
- * $Id: odbc.c,v 1.19 2000/07/28 07:13:58 hubbe Exp $
+ * $Id: odbc.c,v 1.20 2000/08/31 12:36:23 grubba Exp $
*
* Pike interface to ODBC compliant databases.
*
@@ -16,7 +16,7 @@
#include "config.h"
#endif /* HAVE_CONFIG_H */
-RCSID("$Id: odbc.c,v 1.19 2000/07/28 07:13:58 hubbe Exp $");
+RCSID("$Id: odbc.c,v 1.20 2000/08/31 12:36:23 grubba Exp $");
#include "interpret.h"
#include "object.h"
@@ -234,9 +234,12 @@ static void f_create(INT32 args)
}
odbc_check_error("odbc->create", "Connect failed",
SQLConnect(PIKE_ODBC->hdbc, (unsigned char *)server->str,
- server->len, (unsigned char *)user->str,
- user->len, (unsigned char *)pwd->str,
- pwd->len), NULL);
+ DO_NOT_WARN(server->len),
+ (unsigned char *)user->str,
+ DO_NOT_WARN(user->len),
+ (unsigned char *)pwd->str,
+ DO_NOT_WARN(pwd->len)),
+ NULL);
PIKE_ODBC->flags |= PIKE_ODBC_CONNECTED;
pop_n_elems(args);
}
diff --git a/src/modules/Odbc/odbc_result.c b/src/modules/Odbc/odbc_result.c
index cab3f2c97a..6f89737106 100644
--- a/src/modules/Odbc/odbc_result.c
+++ b/src/modules/Odbc/odbc_result.c
@@ -1,5 +1,5 @@
/*
- * $Id: odbc_result.c,v 1.20 2000/08/04 11:32:43 grubba Exp $
+ * $Id: odbc_result.c,v 1.21 2000/08/31 12:40:15 grubba Exp $
*
* Pike interface to ODBC compliant databases
*
@@ -16,7 +16,7 @@
#include "config.h"
#endif /* HAVE_CONFIG_H */
-RCSID("$Id: odbc_result.c,v 1.20 2000/08/04 11:32:43 grubba Exp $");
+RCSID("$Id: odbc_result.c,v 1.21 2000/08/31 12:40:15 grubba Exp $");
#include "interpret.h"
#include "object.h"
@@ -32,6 +32,7 @@ RCSID("$Id: odbc_result.c,v 1.20 2000/08/04 11:32:43 grubba Exp $");
#include "pike_memory.h"
#include "pike_macros.h"
#include "module_support.h"
+#include "bignum.h"
#include "precompiled_odbc.h"
@@ -145,7 +146,9 @@ static void odbc_fix_fields(void)
while (1) {
odbc_check_error("odbc_fix_fields", "Failed to fetch field info",
SQLDescribeCol(PIKE_ODBC_RES->hstmt, i+1,
- buf, buf_size, &name_len,
+ buf,
+ DO_NOT_WARN(buf_size),
+ &name_len,
&sql_type, &precision, &scale, &nullable),
0);
if (name_len < (ptrdiff_t)buf_size) {
@@ -237,7 +240,7 @@ static void odbc_fix_fields(void)
odbc_field_types[i] = SQL_C_BINARY;
break;
}
- push_text("length"); push_int(precision);
+ push_text("length"); push_int64(precision);
push_text("decimals"); push_int(scale);
push_text("flags");
nbits = 0;
@@ -303,7 +306,8 @@ static void f_execute(INT32 args)
get_all_args("odbc_result->execute", args, "%S", &q);
odbc_check_error("odbc_result->execute", "Query failed",
- SQLExecDirect(hstmt, (unsigned char *)q->str, q->len),
+ SQLExecDirect(hstmt, (unsigned char *)q->str,
+ DO_NOT_WARN(q->len)),
NULL);
odbc_check_error("odbc_result->execute", "Couldn't get the number of fields",
@@ -329,7 +333,7 @@ static void f_execute(INT32 args)
static void f_num_rows(INT32 args)
{
pop_n_elems(args);
- push_int(PIKE_ODBC_RES->num_rows);
+ push_int64(PIKE_ODBC_RES->num_rows);
}
/* int num_fields() */
diff --git a/src/modules/Odbc/precompiled_odbc.h b/src/modules/Odbc/precompiled_odbc.h
index a07230667d..b0aab4c893 100644
--- a/src/modules/Odbc/precompiled_odbc.h
+++ b/src/modules/Odbc/precompiled_odbc.h
@@ -1,5 +1,5 @@
/*
- * $Id: precompiled_odbc.h,v 1.12 2000/08/30 11:26:02 grubba Exp $
+ * $Id: precompiled_odbc.h,v 1.13 2000/08/31 12:39:51 grubba Exp $
*
* Pike interface to ODBC compliant databases.
*
@@ -77,7 +77,7 @@ struct field_info {
struct precompiled_odbc {
HDBC hdbc;
- int affected_rows;
+ SQLLEN affected_rows;
unsigned int flags;
struct pike_string *last_error;
};
diff --git a/src/modules/_Crypto/lib/idea.c b/src/modules/_Crypto/lib/idea.c
index 9c3dda4e32..34063f1503 100644
--- a/src/modules/_Crypto/lib/idea.c
+++ b/src/modules/_Crypto/lib/idea.c
@@ -1,4 +1,4 @@
-/* $Id: idea.c,v 1.5 1998/03/28 14:03:53 grubba Exp $
+/* $Id: idea.c,v 1.6 2000/08/31 12:43:56 grubba Exp $
*
* The basic IDEA transformation
*
@@ -42,7 +42,7 @@
* compiler doesn't schedule branches.
*/
#ifdef SMALL_CACHE
-const static unsigned INT16
+static unsigned INT16
mul(unsigned INT16 a, unsigned INT16 b)
{
register unsigned INT32 p;
@@ -70,7 +70,7 @@ mul(unsigned INT16 a, unsigned INT16 b)
* algorithm. It is unrolled twice to avoid swapping the registers each
* iteration, and some subtracts of t have been changed to adds.
*/
-static const unsigned INT16
+static unsigned INT16
inv(unsigned INT16 x)
{
unsigned INT16 t0, t1;
diff --git a/src/modules/files/stat.c b/src/modules/files/stat.c
index 61d29abb18..4f49515f22 100644
--- a/src/modules/files/stat.c
+++ b/src/modules/files/stat.c
@@ -1,9 +1,9 @@
/*
- * $Id: stat.c,v 1.11 2000/08/30 21:14:20 mast Exp $
+ * $Id: stat.c,v 1.12 2000/08/31 12:49:52 grubba Exp $
*/
#include "global.h"
-RCSID("$Id: stat.c,v 1.11 2000/08/30 21:14:20 mast Exp $");
+RCSID("$Id: stat.c,v 1.12 2000/08/31 12:49:52 grubba Exp $");
#include "fdlib.h"
#include "interpret.h"
#include "svalue.h"
@@ -124,11 +124,11 @@ static void stat_index_set (INT32 args);
static int stat_compat_set (size_t pos, INT64 val)
{
switch (pos) {
- case 0: THIS_STAT->s.st_mode = val; break;
+ case 0: DO_NOT_WARN(THIS_STAT->s.st_mode = val); break;
case 1:
if (val >= 0) {
THIS_STAT->s.st_mode = (THIS_STAT->s.st_mode & ~S_IFMT) | S_IFREG;
- THIS_STAT->s.st_size = val;
+ DO_NOT_WARN(THIS_STAT->s.st_size = val);
}
else {
THIS_STAT->s.st_size = 0;
@@ -140,11 +140,11 @@ static int stat_compat_set (size_t pos, INT64 val)
THIS_STAT->s.st_mode = THIS_STAT->s.st_mode & ~S_IFMT;
}
break;
- case 2: THIS_STAT->s.st_atime = val; break;
- case 3: THIS_STAT->s.st_mtime = val; break;
- case 4: THIS_STAT->s.st_ctime = val; break;
- case 5: THIS_STAT->s.st_uid = val; break;
- case 6: THIS_STAT->s.st_gid = val; break;
+ case 2: DO_NOT_WARN(THIS_STAT->s.st_atime = val); break;
+ case 3: DO_NOT_WARN(THIS_STAT->s.st_mtime = val); break;
+ case 4: DO_NOT_WARN(THIS_STAT->s.st_ctime = val); break;
+ case 5: DO_NOT_WARN(THIS_STAT->s.st_uid = val); break;
+ case 6: DO_NOT_WARN(THIS_STAT->s.st_gid = val); break;
default: return 0;
}
return 1;
@@ -667,21 +667,21 @@ static void stat_index_set (INT32 args)
SIMPLE_BAD_ARG_ERROR ("Stat `[]=", 2, "integer");
switch (code) {
- case STAT_DEV: THIS_STAT->s.st_dev = int_val; break;
- case STAT_INO: THIS_STAT->s.st_ino = int_val; break;
- case STAT_MODE: THIS_STAT->s.st_mode = int_val; break;
- case STAT_NLINK: THIS_STAT->s.st_nlink = int_val; break;
- case STAT_UID: THIS_STAT->s.st_uid = int_val; break;
- case STAT_GID: THIS_STAT->s.st_gid = int_val; break;
- case STAT_RDEV: THIS_STAT->s.st_rdev = int_val; break;
- case STAT_SIZE: THIS_STAT->s.st_size = int_val; break;
+ case STAT_DEV: DO_NOT_WARN(THIS_STAT->s.st_dev = int_val); break;
+ case STAT_INO: DO_NOT_WARN(THIS_STAT->s.st_ino = int_val); break;
+ case STAT_MODE: DO_NOT_WARN(THIS_STAT->s.st_mode = int_val); break;
+ case STAT_NLINK: DO_NOT_WARN(THIS_STAT->s.st_nlink = int_val); break;
+ case STAT_UID: DO_NOT_WARN(THIS_STAT->s.st_uid = int_val); break;
+ case STAT_GID: DO_NOT_WARN(THIS_STAT->s.st_gid = int_val); break;
+ case STAT_RDEV: DO_NOT_WARN(THIS_STAT->s.st_rdev = int_val); break;
+ case STAT_SIZE: DO_NOT_WARN(THIS_STAT->s.st_size = int_val); break;
#if 0
- case STAT_BLKSIZE: THIS_STAT->s.st_blksize = int_val; break;
- case STAT_BLOCKS: THIS_STAT->s.st_blocks = int_val; break;
+ case STAT_BLKSIZE: DO_NOT_WARN(THIS_STAT->s.st_blksize = int_val); break;
+ case STAT_BLOCKS: DO_NOT_WARN(THIS_STAT->s.st_blocks = int_val); break;
#endif /* 0 */
- case STAT_ATIME: THIS_STAT->s.st_atime = int_val; break;
- case STAT_MTIME: THIS_STAT->s.st_mtime = int_val; break;
- case STAT_CTIME: THIS_STAT->s.st_ctime = int_val; break;
+ case STAT_ATIME: DO_NOT_WARN(THIS_STAT->s.st_atime = int_val); break;
+ case STAT_MTIME: DO_NOT_WARN(THIS_STAT->s.st_mtime = int_val); break;
+ case STAT_CTIME: DO_NOT_WARN(THIS_STAT->s.st_ctime = int_val); break;
default:
fatal ("stat_index_set is not kept up-to-date with stat_map.\n");
--
GitLab