mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Made several variables "const char *" instead of "char *" as proposed by Qingqing Zhou <zhouqq@cs.toronto.edu>.

Browse Source 
- Replaced all strdup() calls by ECPGstrdup().
- Set ecpg library version to 5.2.
- Set ecpg version to 4.2.1.
This commit is contained in:
Michael Meskes 2005-11-30 12:49:49 +00:00
parent 339fbbb9a0
commit 150131d9d9
8 changed files with 49 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/interfaces/ecpg/ChangeLog
View File

@ -1952,3 +1952,11 @@ Wed Oct 5 16:57:42 CEST 2005
- Set ecpg library version to 5.1. - Set ecpg library version to 5.1.
- Set ecpg version to 4.1.1. - Set ecpg version to 4.1.1.
Wed Nov 30 12:49:13 CET 2005
- Made several variables "const char *" instead of "char *" as
proposed by Qingqing Zhou <zhouqq@cs.toronto.edu>.
- Replaced all strdup() calls by ECPGstrdup().
- Set ecpg library version to 5.2.
- Set ecpg version to 4.2.1.

4
src/interfaces/ecpg/ecpglib/Makefile
View File

@ -4,7 +4,7 @@
# #
# Copyright (c) 1994, Regents of the University of California # Copyright (c) 1994, Regents of the University of California
# #
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.33 2005/03/14 17:27:50 momjian Exp $ # $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.34 2005/11/30 12:49:49 meskes Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
NAME= ecpg NAME= ecpg
SO_MAJOR_VERSION= 5 SO_MAJOR_VERSION= 5
SO_MINOR_VERSION= 1 SO_MINOR_VERSION= 2
DLTYPE= library DLTYPE= library
override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/ecpg/include \ override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/ecpg/include \

26
src/interfaces/ecpg/ecpglib/connect.c
View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.26 2005/10/15 02:49:47 momjian Exp $ */ /* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.27 2005/11/30 12:49:49 meskes Exp $ */
#define POSTGRES_ECPG_INTERNAL #define POSTGRES_ECPG_INTERNAL
#include "postgres_fe.h" #include "postgres_fe.h"
@ -265,7 +265,7 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
struct sqlca_t *sqlca = ECPGget_sqlca(); struct sqlca_t *sqlca = ECPGget_sqlca();
enum COMPAT_MODE compat = c; enum COMPAT_MODE compat = c;
struct connection *this; struct connection *this;
char *dbname = name ? strdup(name) : NULL, char *dbname = name ? ECPGstrdup(name, lineno) : NULL,
*host = NULL, *host = NULL,
*tmp, *tmp,
*port = NULL, *port = NULL,
@ -287,7 +287,7 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
if (envname) if (envname)
{ {
ECPGfree(dbname); ECPGfree(dbname);
dbname = strdup(envname); dbname = ECPGstrdup(envname, lineno);
} }
} }
@ -307,17 +307,17 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
tmp = strrchr(dbname, ':'); tmp = strrchr(dbname, ':');
if (tmp != NULL) /* port number given */ if (tmp != NULL) /* port number given */
{ {
port = strdup(tmp + 1); port = ECPGstrdup(tmp + 1, lineno);
*tmp = '\0'; *tmp = '\0';
} }
tmp = strrchr(dbname, '@'); tmp = strrchr(dbname, '@');
if (tmp != NULL) /* host name given */ if (tmp != NULL) /* host name given */
{ {
host = strdup(tmp + 1); host = ECPGstrdup(tmp + 1, lineno);
*tmp = '\0'; *tmp = '\0';
} }
realname = strdup(dbname); realname = ECPGstrdup(dbname, lineno);
} }
else if (strncmp(dbname, "tcp:", 4) == 0 || strncmp(dbname, "unix:", 5) == 0) else if (strncmp(dbname, "tcp:", 4) == 0 || strncmp(dbname, "unix:", 5) == 0)
{ {
@ -345,14 +345,14 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
tmp = strrchr(dbname + offset, '?'); tmp = strrchr(dbname + offset, '?');
if (tmp != NULL) /* options given */ if (tmp != NULL) /* options given */
{ {
options = strdup(tmp + 1); options = ECPGstrdup(tmp + 1, lineno);
*tmp = '\0'; *tmp = '\0';
} }
tmp = last_dir_separator(dbname + offset); tmp = last_dir_separator(dbname + offset);
if (tmp != NULL) /* database name given */ if (tmp != NULL) /* database name given */
{ {
realname = strdup(tmp + 1); realname = ECPGstrdup(tmp + 1, lineno);
*tmp = '\0'; *tmp = '\0';
} }
@ -365,7 +365,7 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
if ((tmp2 = strchr(tmp + 1, ':')) != NULL) if ((tmp2 = strchr(tmp + 1, ':')) != NULL)
{ {
*tmp2 = '\0'; *tmp2 = '\0';
host = strdup(tmp + 1); host = ECPGstrdup(tmp + 1, lineno);
if (strncmp(dbname, "unix:", 5) != 0) if (strncmp(dbname, "unix:", 5) != 0)
{ {
ECPGlog("connect: socketname %s given for TCP connection in line %d\n", host, lineno); ECPGlog("connect: socketname %s given for TCP connection in line %d\n", host, lineno);
@ -384,7 +384,7 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
} }
} }
else else
port = strdup(tmp + 1); port = ECPGstrdup(tmp + 1, lineno);
} }
if (strncmp(dbname, "unix:", 5) == 0) if (strncmp(dbname, "unix:", 5) == 0)
@ -407,14 +407,14 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
} }
} }
else else
host = strdup(dbname + offset); host = ECPGstrdup(dbname + offset, lineno);
} }
else else
realname = strdup(dbname); realname = ECPGstrdup(dbname, lineno);
} }
else else
realname = strdup(dbname); realname = ECPGstrdup(dbname, lineno);
} }
else else
realname = NULL; realname = NULL;

12
src/interfaces/ecpg/ecpglib/descriptor.c
View File

@ -1,6 +1,6 @@
/* dynamic SQL support routines /* dynamic SQL support routines
* *
* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/descriptor.c,v 1.12 2004/08/29 05:06:59 momjian Exp $ * $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/descriptor.c,v 1.13 2005/11/30 12:49:49 meskes Exp $
*/ */
#define POSTGRES_ECPG_INTERNAL #define POSTGRES_ECPG_INTERNAL
@ -49,7 +49,7 @@ ECPGDynamicType_DDT(Oid type)
} }
bool bool
ECPGget_desc_header(int lineno, char *desc_name, int *count) ECPGget_desc_header(int lineno, const char *desc_name, int *count)
{ {
PGresult *ECPGresult; PGresult *ECPGresult;
struct sqlca_t *sqlca = ECPGget_sqlca(); struct sqlca_t *sqlca = ECPGget_sqlca();
@ -188,7 +188,7 @@ get_char_item(int lineno, void *var, enum ECPGttype vartype, char *value, int va
} }
bool bool
ECPGget_desc(int lineno, char *desc_name, int index,...) ECPGget_desc(int lineno, const char *desc_name, int index,...)
{ {
va_list args; va_list args;
PGresult *ECPGresult; PGresult *ECPGresult;
@ -383,7 +383,7 @@ ECPGget_desc(int lineno, char *desc_name, int index,...)
/* Make sure we do NOT honor the locale for numeric input */ /* Make sure we do NOT honor the locale for numeric input */
/* since the database gives the standard decimal point */ /* since the database gives the standard decimal point */
oldlocale = strdup(setlocale(LC_NUMERIC, NULL)); oldlocale = ECPGstrdup(setlocale(LC_NUMERIC, NULL), lineno);
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");
memset(&stmt, 0, sizeof stmt); memset(&stmt, 0, sizeof stmt);
@ -431,7 +431,7 @@ ECPGget_desc(int lineno, char *desc_name, int index,...)
} }
bool bool
ECPGset_desc_header(int lineno, char *desc_name, int count) ECPGset_desc_header(int lineno, const char *desc_name, int count)
{ {
struct descriptor *desc; struct descriptor *desc;
@ -452,7 +452,7 @@ ECPGset_desc_header(int lineno, char *desc_name, int count)
} }
bool bool
ECPGset_desc(int lineno, char *desc_name, int index,...) ECPGset_desc(int lineno, const char *desc_name, int index,...)
{ {
va_list args; va_list args;
struct descriptor *desc; struct descriptor *desc;

11
src/interfaces/ecpg/ecpglib/execute.c
View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.43 2005/10/15 02:49:47 momjian Exp $ */ /* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.44 2005/11/30 12:49:49 meskes Exp $ */
/* /*
* The aim is to get a simpler inteface to the database routines. * The aim is to get a simpler inteface to the database routines.
@ -141,7 +141,7 @@ ECPGget_variable(va_list APREF, enum ECPGttype type, struct variable * var, bool
* ind_offset - indicator offset * ind_offset - indicator offset
*/ */
static bool static bool
create_statement(int lineno, int compat, int force_indicator, struct connection * connection, struct statement ** stmt, char *query, va_list ap) create_statement(int lineno, int compat, int force_indicator, struct connection * connection, struct statement ** stmt, const char *query, va_list ap)
{ {
struct variable **list = &((*stmt)->inlist); struct variable **list = &((*stmt)->inlist);
enum ECPGttype type; enum ECPGttype type;
@ -149,7 +149,7 @@ create_statement(int lineno, int compat, int force_indicator, struct connection
if (!(*stmt = (struct statement *) ECPGalloc(sizeof(struct statement), lineno))) if (!(*stmt = (struct statement *) ECPGalloc(sizeof(struct statement), lineno)))
return false; return false;
(*stmt)->command = query; (*stmt)->command = ECPGstrdup(query, lineno);
(*stmt)->connection = connection; (*stmt)->connection = connection;
(*stmt)->lineno = lineno; (*stmt)->lineno = lineno;
(*stmt)->compat = compat; (*stmt)->compat = compat;
@ -224,6 +224,7 @@ free_statement(struct statement * stmt)
return; return;
free_variable(stmt->inlist); free_variable(stmt->inlist);
free_variable(stmt->outlist); free_variable(stmt->outlist);
ECPGfree(stmt->command);
ECPGfree(stmt); ECPGfree(stmt);
} }
@ -1359,7 +1360,7 @@ ECPGexecute(struct statement * stmt)
} }
bool bool
ECPGdo(int lineno, int compat, int force_indicator, const char *connection_name, char *query,...) ECPGdo(int lineno, int compat, int force_indicator, const char *connection_name, const char *query,...)
{ {
va_list args; va_list args;
struct statement *stmt; struct statement *stmt;
@ -1369,7 +1370,7 @@ ECPGdo(int lineno, int compat, int force_indicator, const char *connection_name,
/* Make sure we do NOT honor the locale for numeric input/output */ /* Make sure we do NOT honor the locale for numeric input/output */
/* since the database wants the standard decimal point */ /* since the database wants the standard decimal point */
oldlocale = strdup(setlocale(LC_NUMERIC, NULL)); oldlocale = ECPGstrdup(setlocale(LC_NUMERIC, NULL), lineno);
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");
if (!ECPGinit(con, connection_name, lineno)) if (!ECPGinit(con, connection_name, lineno))

8
src/interfaces/ecpg/ecpglib/prepare.c
View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/prepare.c,v 1.14 2005/10/15 02:49:47 momjian Exp $ */ /* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/prepare.c,v 1.15 2005/11/30 12:49:49 meskes Exp $ */
#define POSTGRES_ECPG_INTERNAL #define POSTGRES_ECPG_INTERNAL
#include "postgres_fe.h" #include "postgres_fe.h"
@ -60,7 +60,7 @@ replace_variables(char *text)
/* handle the EXEC SQL PREPARE statement */ /* handle the EXEC SQL PREPARE statement */
bool bool
ECPGprepare(int lineno, char *name, char *variable) ECPGprepare(int lineno, const char *name, const char *variable)
{ {
struct statement *stmt; struct statement *stmt;
struct prepared_statement *this; struct prepared_statement *this;
@ -112,7 +112,7 @@ ECPGprepare(int lineno, char *name, char *variable)
/* handle the EXEC SQL DEALLOCATE PREPARE statement */ /* handle the EXEC SQL DEALLOCATE PREPARE statement */
bool bool
ECPGdeallocate(int lineno, int c, char *name) ECPGdeallocate(int lineno, int c, const char *name)
{ {
bool ret = ECPGdeallocate_one(lineno, name); bool ret = ECPGdeallocate_one(lineno, name);
enum COMPAT_MODE compat = c; enum COMPAT_MODE compat = c;
@ -133,7 +133,7 @@ ECPGdeallocate(int lineno, int c, char *name)
} }
bool bool
ECPGdeallocate_one(int lineno, char *name) ECPGdeallocate_one(int lineno, const char *name)
{ {
struct prepared_statement *this, struct prepared_statement *this,
*prev; *prev;

16
src/interfaces/ecpg/include/ecpglib.h
View File

@ -48,12 +48,12 @@ bool ECPGstatus(int, const char *);
bool ECPGsetcommit(int, const char *, const char *); bool ECPGsetcommit(int, const char *, const char *);
bool ECPGsetconn(int, const char *); bool ECPGsetconn(int, const char *);
bool ECPGconnect(int, int, const char *, const char *, const char *, const char *, int); bool ECPGconnect(int, int, const char *, const char *, const char *, const char *, int);
bool ECPGdo(int, int, int, const char *, char *,...); bool ECPGdo(int, int, int, const char *, const char *,...);
bool ECPGtrans(int, const char *, const char *); bool ECPGtrans(int, const char *, const char *);
bool ECPGdisconnect(int, const char *); bool ECPGdisconnect(int, const char *);
bool ECPGprepare(int, char *, char *); bool ECPGprepare(int, const char *, const char *);
bool ECPGdeallocate(int, int, char *); bool ECPGdeallocate(int, int, const char *);
bool ECPGdeallocate_one(int, char *); bool ECPGdeallocate_one(int, const char *);
bool ECPGdeallocate_all(int); bool ECPGdeallocate_all(int);
char *ECPGprepared_statement(const char *); char *ECPGprepared_statement(const char *);
@ -75,10 +75,10 @@ bool ECPGdeallocate_desc(int line, const char *name);
bool ECPGallocate_desc(int line, const char *name); bool ECPGallocate_desc(int line, const char *name);
void ECPGraise(int line, int code, const char *sqlstate, const char *str); void ECPGraise(int line, int code, const char *sqlstate, const char *str);
void ECPGraise_backend(int line, PGresult *result, PGconn *conn, int compat); void ECPGraise_backend(int line, PGresult *result, PGconn *conn, int compat);
bool ECPGget_desc_header(int, char *, int *); bool ECPGget_desc_header(int, const char *, int *);
bool ECPGget_desc(int, char *, int,...); bool ECPGget_desc(int, const char *, int,...);
bool ECPGset_desc_header(int, char *, int); bool ECPGset_desc_header(int, const char *, int);
bool ECPGset_desc(int, char *, int,...); bool ECPGset_desc(int, const char *, int,...);
void ECPGset_noind_null(enum ECPGttype, void *); void ECPGset_noind_null(enum ECPGttype, void *);
bool ECPGis_noind_null(enum ECPGttype, void *); bool ECPGis_noind_null(enum ECPGttype, void *);

4
src/interfaces/ecpg/preproc/Makefile
View File

@ -4,7 +4,7 @@
# #
# Copyright (c) 1998-2005, PostgreSQL Global Development Group # Copyright (c) 1998-2005, PostgreSQL Global Development Group
# #
# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.114 2005/03/14 17:27:50 momjian Exp $ # $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.115 2005/11/30 12:49:49 meskes Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -14,7 +14,7 @@ top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
MAJOR_VERSION= 4 MAJOR_VERSION= 4
MINOR_VERSION= 1 MINOR_VERSION= 2
PATCHLEVEL=1 PATCHLEVEL=1
override CPPFLAGS := -I$(srcdir)/../include -I$(srcdir) $(CPPFLAGS) \ override CPPFLAGS := -I$(srcdir)/../include -I$(srcdir) $(CPPFLAGS) \