diff options
5 files changed, 93 insertions, 1 deletions
diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo index 8b88e0f61e5..ca6366b392c 100644 --- a/databases/sqlrelay/distinfo +++ b/databases/sqlrelay/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2011/11/02 13:59:29 fhajny Exp $ +$NetBSD: distinfo,v 1.7 2013/10/20 18:18:28 joerg Exp $ SHA1 (sqlrelay-0.43.tar.gz) = f645332ff0dd14edd2e44643cda651d7c1c59abe RMD160 (sqlrelay-0.43.tar.gz) = 88638f122467c859db2fc5c8fbf983416c7f05bd @@ -7,3 +7,7 @@ SHA1 (patch-ac) = e69292a2674083ffd10424e73760a0810fd629d8 SHA1 (patch-ad) = a7e7047bcaf28de96a2baab527e4b1f607deb7c6 SHA1 (patch-init__netbsd__rc.d__sqlrelay.in) = b10de222c99ab03a541c9a6a3929928c6936d0f4 SHA1 (patch-src__listener__sqlrlistener.h) = 11f977c48b8e0a01779357475373af738c81d7f3 +SHA1 (patch-src_connection_sqlrcursor.h) = 7ce854ad152d2f046f32c6a2bba560e0e8531ab8 +SHA1 (patch-src_connection_sqlrcursor_queryparse.C) = 0de5f1fb2388c06fa0a130cd3813e3c6c8fbff74 +SHA1 (patch-src_connections_oracle8_oracle8connection.C) = 8e86b79313e42f835d82ed4578c37532022677d9 +SHA1 (patch-src_connections_router_routerconnection.C) = 72ae0b42fb53a188e02bfacd704040d22236cfa6 diff --git a/databases/sqlrelay/patches/patch-src_connection_sqlrcursor.h b/databases/sqlrelay/patches/patch-src_connection_sqlrcursor.h new file mode 100644 index 00000000000..2a24b0b71eb --- /dev/null +++ b/databases/sqlrelay/patches/patch-src_connection_sqlrcursor.h @@ -0,0 +1,17 @@ +$NetBSD: patch-src_connection_sqlrcursor.h,v 1.1 2013/10/20 18:18:28 joerg Exp $ + +--- src/connection/sqlrcursor.h.orig 2013-10-17 12:20:42.000000000 +0000 ++++ src/connection/sqlrcursor.h +@@ -167,9 +167,9 @@ class sqlrcursor_svr { + // methods/variables used by derived classes + stringbuffer *fakeInputBinds(const char *query); + +- bool skipComment(char **ptr, const char *endptr); +- bool skipWhitespace(char **ptr, const char *endptr); +- bool advance(char **ptr, const char *endptr, ++ bool skipComment(const char **ptr, const char *endptr); ++ bool skipWhitespace(const char **ptr, const char *endptr); ++ bool advance(const char **ptr, const char *endptr, + uint16_t steps); + + sqlrconnection_svr *conn; diff --git a/databases/sqlrelay/patches/patch-src_connection_sqlrcursor_queryparse.C b/databases/sqlrelay/patches/patch-src_connection_sqlrcursor_queryparse.C new file mode 100644 index 00000000000..21800bf0ec6 --- /dev/null +++ b/databases/sqlrelay/patches/patch-src_connection_sqlrcursor_queryparse.C @@ -0,0 +1,41 @@ +$NetBSD: patch-src_connection_sqlrcursor_queryparse.C,v 1.1 2013/10/20 18:18:28 joerg Exp $ + +--- src/connection/sqlrcursor/queryparse.C.orig 2013-10-17 12:19:25.000000000 +0000 ++++ src/connection/sqlrcursor/queryparse.C +@@ -49,8 +49,8 @@ char *sqlrcursor_svr::skipWhitespaceAndC + + void sqlrcursor_svr::checkForTempTable(const char *query, uint32_t length) { + +- char *ptr=(char *)query; +- char *endptr=(char *)query+length; ++ const char *ptr=query; ++ const char *endptr=query+length; + + // skip any leading comments + if (!skipWhitespace(&ptr,endptr) || !skipComment(&ptr,endptr) || +@@ -78,7 +78,7 @@ void sqlrcursor_svr::checkForTempTable(c + conn->addSessionTempTableForDrop(tablename.getString()); + } + +-bool sqlrcursor_svr::skipComment(char **ptr, const char *endptr) { ++bool sqlrcursor_svr::skipComment(const char **ptr, const char *endptr) { + while (*ptr<endptr && !charstring::compare(*ptr,"--",2)) { + while (**ptr && **ptr!='\n') { + (*ptr)++; +@@ -87,14 +87,14 @@ bool sqlrcursor_svr::skipComment(char ** + return *ptr!=endptr; + } + +-bool sqlrcursor_svr::skipWhitespace(char **ptr, const char *endptr) { ++bool sqlrcursor_svr::skipWhitespace(const char **ptr, const char *endptr) { + while ((**ptr==' ' || **ptr=='\n' || **ptr==' ') && *ptr<endptr) { + (*ptr)++; + } + return *ptr!=endptr; + } + +-bool sqlrcursor_svr::advance(char **ptr, const char *endptr, uint16_t steps) { ++bool sqlrcursor_svr::advance(const char **ptr, const char *endptr, uint16_t steps) { + for (uint16_t i=0; i<steps && *ptr<endptr; i++) { + (*ptr)++; + } diff --git a/databases/sqlrelay/patches/patch-src_connections_oracle8_oracle8connection.C b/databases/sqlrelay/patches/patch-src_connections_oracle8_oracle8connection.C new file mode 100644 index 00000000000..2c06f9c9208 --- /dev/null +++ b/databases/sqlrelay/patches/patch-src_connections_oracle8_oracle8connection.C @@ -0,0 +1,15 @@ +$NetBSD: patch-src_connections_oracle8_oracle8connection.C,v 1.1 2013/10/20 18:18:28 joerg Exp $ + +--- src/connections/oracle8/oracle8connection.C.orig 2013-10-17 12:22:31.000000000 +0000 ++++ src/connections/oracle8/oracle8connection.C +@@ -1076,8 +1076,8 @@ void oracle8cursor::returnOutputBindClob + + void oracle8cursor::checkForTempTable(const char *query, uint32_t length) { + +- char *ptr=(char *)query; +- char *endptr=(char *)query+length; ++ const char *ptr=query; ++ const char *endptr=query+length; + + // skip any leading comments + if (!skipWhitespace(&ptr,endptr) || !skipComment(&ptr,endptr) || diff --git a/databases/sqlrelay/patches/patch-src_connections_router_routerconnection.C b/databases/sqlrelay/patches/patch-src_connections_router_routerconnection.C new file mode 100644 index 00000000000..a52b7340a58 --- /dev/null +++ b/databases/sqlrelay/patches/patch-src_connections_router_routerconnection.C @@ -0,0 +1,15 @@ +$NetBSD: patch-src_connections_router_routerconnection.C,v 1.1 2013/10/20 18:18:28 joerg Exp $ + +--- src/connections/router/routerconnection.C.orig 2013-10-17 12:22:33.000000000 +0000 ++++ src/connections/router/routerconnection.C +@@ -600,8 +600,8 @@ void routercursor::checkForTempTable(con + + // for oracle db's... + +- char *ptr=(char *)query; +- char *endptr=(char *)query+length; ++ const char *ptr=query; ++ const char *endptr=query+length; + + // skip any leading comments + if (!skipWhitespace(&ptr,endptr) || !skipComment(&ptr,endptr) || |