From c2b263623b8a7fb109b879bcd5ee486d3a7d565c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Sun, 2 Nov 1997 23:20:51 +0100
Subject: [PATCH] Removed volatile.
Rev: src/modules/Odbc/odbc.c:1.6
Rev: src/modules/Odbc/odbc_result.c:1.7
Rev: src/modules/Odbc/precompiled_odbc.h:1.3
---
src/modules/Odbc/odbc.c | 20 ++++++++++----------
src/modules/Odbc/odbc_result.c | 8 ++++----
src/modules/Odbc/precompiled_odbc.h | 8 ++++----
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/modules/Odbc/odbc.c b/src/modules/Odbc/odbc.c
index ae7840b084..f69892aaa7 100644
--- a/src/modules/Odbc/odbc.c
+++ b/src/modules/Odbc/odbc.c
@@ -1,5 +1,5 @@
/*
- * $Id: odbc.c,v 1.5 1997/11/02 18:42:12 grubba Exp $
+ * $Id: odbc.c,v 1.6 1997/11/02 22:19:49 grubba Exp $
*
* Pike interface to ODBC compliant databases.
*
@@ -15,7 +15,7 @@
#endif /* HAVE_CONFIG_H */
#include "global.h"
-RCSID("$Id: odbc.c,v 1.5 1997/11/02 18:42:12 grubba Exp $");
+RCSID("$Id: odbc.c,v 1.6 1997/11/02 22:19:49 grubba Exp $");
#include "interpret.h"
#include "object.h"
@@ -46,21 +46,21 @@ struct program *odbc_program = NULL;
* Helper functions
*/
-volatile void odbc_error(const char *fun, const char *msg,
- struct precompiled_odbc *odbc, HSTMT hstmt,
- RETCODE code, void (*clean)(void));
+void odbc_error(const char *fun, const char *msg,
+ struct precompiled_odbc *odbc, HSTMT hstmt,
+ RETCODE code, void (*clean)(void));
-static INLINE volatile void odbc_check_error(const char *fun, const char *msg,
- RETCODE code, void (*clean)(void))
+static INLINE void odbc_check_error(const char *fun, const char *msg,
+ RETCODE code, void (*clean)(void))
{
if ((code != SQL_SUCCESS) && (code != SQL_SUCCESS_WITH_INFO)) {
odbc_error(fun, msg, PIKE_ODBC, PIKE_ODBC->hstmt, code, clean);
}
}
-volatile void odbc_error(const char *fun, const char *msg,
- struct precompiled_odbc *odbc, HSTMT hstmt,
- RETCODE code, void (*clean)(void))
+void odbc_error(const char *fun, const char *msg,
+ struct precompiled_odbc *odbc, HSTMT hstmt,
+ RETCODE code, void (*clean)(void))
{
RETCODE _code;
unsigned char errcode[256];
diff --git a/src/modules/Odbc/odbc_result.c b/src/modules/Odbc/odbc_result.c
index 8fdfcd9716..9cb2770c6e 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.6 1997/11/02 18:41:59 grubba Exp $
+ * $Id: odbc_result.c,v 1.7 1997/11/02 22:20:51 grubba Exp $
*
* Pike interface to ODBC compliant databases
*
@@ -17,7 +17,7 @@
#ifdef HAVE_ODBC
#include "global.h"
-RCSID("$Id: odbc_result.c,v 1.6 1997/11/02 18:41:59 grubba Exp $");
+RCSID("$Id: odbc_result.c,v 1.7 1997/11/02 22:20:51 grubba Exp $");
#include "interpret.h"
#include "object.h"
@@ -67,8 +67,8 @@ static void clean_sql_res(void)
PIKE_ODBC_RES->hstmt = SQL_NULL_HSTMT;
}
-static INLINE volatile void odbc_check_error(const char *fun, const char *msg,
- RETCODE code, void (*clean)(void))
+static INLINE void odbc_check_error(const char *fun, const char *msg,
+ RETCODE code, void (*clean)(void))
{
if ((code != SQL_SUCCESS) && (code != SQL_SUCCESS_WITH_INFO)) {
odbc_error(fun, msg, PIKE_ODBC_RES->odbc, PIKE_ODBC_RES->hstmt,
diff --git a/src/modules/Odbc/precompiled_odbc.h b/src/modules/Odbc/precompiled_odbc.h
index 2d2485bf81..d91f9d9828 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.2 1997/06/10 03:21:43 grubba Exp $
+ * $Id: precompiled_odbc.h,v 1.3 1997/11/02 22:19:35 grubba Exp $
*
* Pike interface to ODBC compliant databases.
*
@@ -72,9 +72,9 @@ struct precompiled_odbc_result {
/*
* Prototypes
*/
-volatile void odbc_error(const char *fun, const char *msg,
- struct precompiled_odbc *odbc, HSTMT hstmt,
- RETCODE code, void (*clean)(void));
+void odbc_error(const char *fun, const char *msg,
+ struct precompiled_odbc *odbc, HSTMT hstmt,
+ RETCODE code, void (*clean)(void));
void init_odbc_res_programs(void);
void exit_odbc_res(void);
--
GitLab