From 08885f0236e5e03a099a6b99e740aceef781e56e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
 <grubba@grubba.org>
Date: Sun, 20 Apr 1997 06:07:06 +0200
Subject: [PATCH] Fixed some warnings

Rev: src/modules/Mysql/mysql.c:1.4
Rev: src/modules/Mysql/precompiled_mysql.h:1.3
Rev: src/modules/Mysql/result.c:1.6
---
 src/modules/Mysql/mysql.c             | 24 ++++++++++++----------
 src/modules/Mysql/precompiled_mysql.h |  3 ++-
 src/modules/Mysql/result.c            | 29 ++++++++++++++-------------
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/modules/Mysql/mysql.c b/src/modules/Mysql/mysql.c
index 1117314ae7..976b301cf5 100644
--- a/src/modules/Mysql/mysql.c
+++ b/src/modules/Mysql/mysql.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mysql.c,v 1.3 1997/03/12 12:20:02 hubbe Exp $
+ * $Id: mysql.c,v 1.4 1997/04/20 04:07:02 grubba Exp $
  *
  * SQL database functionality for Pike
  *
@@ -44,15 +44,17 @@ typedef struct dynamic_buffer_s dynamic_buffer;
 #endif /* HAVE_MYSQL */
 
 /* From the Pike-dist */
-#include <global.h>
-#include <svalue.h>
-#include <object.h>
-#include <stralloc.h>
-#include <interpret.h>
-#include <port.h>
-#include <error.h>
-#include <threads.h>
-#include <program.h>
+#include "global.h"
+#include "svalue.h"
+#include "object.h"
+#include "stralloc.h"
+#include "interpret.h"
+#include "port.h"
+#include "error.h"
+#include "threads.h"
+#include "program.h"
+#include "operators.h"
+#include "builtin_functions.h"
 
 /* System includes */
 #ifdef HAVE_STRING_H
@@ -71,7 +73,7 @@ typedef struct dynamic_buffer_s dynamic_buffer;
  * Globals
  */
 
-RCSID("$Id: mysql.c,v 1.3 1997/03/12 12:20:02 hubbe Exp $");
+RCSID("$Id: mysql.c,v 1.4 1997/04/20 04:07:02 grubba Exp $");
 
 struct program *mysql_program = NULL;
 
diff --git a/src/modules/Mysql/precompiled_mysql.h b/src/modules/Mysql/precompiled_mysql.h
index 28085880e8..f9744f315f 100644
--- a/src/modules/Mysql/precompiled_mysql.h
+++ b/src/modules/Mysql/precompiled_mysql.h
@@ -1,5 +1,5 @@
 /*
- * $Id: precompiled_mysql.h,v 1.2 1997/04/20 03:55:48 grubba Exp $
+ * $Id: precompiled_mysql.h,v 1.3 1997/04/20 04:06:59 grubba Exp $
  *
  * SQL database connectivity for Pike
  *
@@ -75,5 +75,6 @@ extern struct program *mysql_result_program;
 void init_mysql_res_efuns(void);
 void init_mysql_res_programs(void);
 void exit_mysql_res(void);
+void mysqlmod_parse_field(MYSQL_FIELD *field, int support_default);
 
 #endif /* PRECOMPILED_MYSQL_H */
diff --git a/src/modules/Mysql/result.c b/src/modules/Mysql/result.c
index 2cd7001fae..3ce6e55265 100644
--- a/src/modules/Mysql/result.c
+++ b/src/modules/Mysql/result.c
@@ -1,5 +1,5 @@
 /*
- * $Id: result.c,v 1.5 1997/04/20 03:55:46 grubba Exp $
+ * $Id: result.c,v 1.6 1997/04/20 04:07:06 grubba Exp $
  *
  * mysql query result
  *
@@ -41,17 +41,18 @@
 typedef struct dynamic_buffer_s dynamic_buffer;
 
 /* From the Pike-dist */
-#include <global.h>
-#include <svalue.h>
-#include <mapping.h>
-#include <object.h>
-#include <program.h>
-#include <stralloc.h>
-#include <interpret.h>
-#include <error.h>
-#include <builtin_functions.h>
-#include <las.h>
-#include <threads.h>
+#include "global.h"
+#include "svalue.h"
+#include "mapping.h"
+#include "object.h"
+#include "program.h"
+#include "stralloc.h"
+#include "interpret.h"
+#include "error.h"
+#include "builtin_functions.h"
+#include "las.h"
+#include "threads.h"
+#include "multiset.h"
 
 /* Local includes */
 #include "precompiled_mysql.h"
@@ -74,7 +75,7 @@ typedef struct dynamic_buffer_s dynamic_buffer;
  * Globals
  */
 
-RCSID("$Id: result.c,v 1.5 1997/04/20 03:55:46 grubba Exp $");
+RCSID("$Id: result.c,v 1.6 1997/04/20 04:07:06 grubba Exp $");
 
 struct program *mysql_result_program = NULL;
 
@@ -351,7 +352,7 @@ static void f_fetch_row(INT32 args)
       if (row[i]) {
 	MYSQL_FIELD *field;
 
-	if (field = mysql_fetch_field(PIKE_MYSQL_RES->result)) {
+	if ((field = mysql_fetch_field(PIKE_MYSQL_RES->result))) {
 	  switch (field->type) {
 	    /* Integer types */
 	  case FIELD_TYPE_SHORT:
-- 
GitLab