git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Department of second thoughts. Remove FRONTEND from snprintf.c because

2005年3月20日 03:53:39 +0000 (03:53 +0000)

committer Bruce Momjian <bruce@momjian.us>

2005年3月20日 03:53:39 +0000 (03:53 +0000)

snprintf is called before the memory system is started. We have to just
malloc/free. There are no elogs in the code so we should be fine.

src/port/Makefile patch | blob | blame | history

src/port/snprintf.c patch | blob | blame | history

diff --git a/src/port/Makefile b/src/port/Makefile

index ea552066b6bf8c4b7c6cf9d3cef45f6e5ca97599..c51559676771595be3fd3251591b4d9eaddd7710 100644 (file)

--- a/src/port/Makefile

+++ b/src/port/Makefile

@@ -15,7 +15,7 @@

# for use only by the backend binaries

# IDENTIFICATION

-# $PostgreSQL: pgsql/src/port/Makefile,v 1.24 2005年03月20日 02:44:45 momjian Exp $

+# $PostgreSQL: pgsql/src/port/Makefile,v 1.25 2005年03月20日 03:53:39 momjian Exp $

#-------------------------------------------------------------------------

@@ -31,7 +31,6 @@ LIBOBJS_SRV := $(LIBOBJS)

LIBOBJS_SRV := $(patsubst dirmod.o,dirmod_srv.o, $(LIBOBJS_SRV))

LIBOBJS_SRV := $(patsubst exec.o,exec_srv.o, $(LIBOBJS_SRV))

LIBOBJS_SRV := $(patsubst getaddrinfo.o,getaddrinfo_srv.o, $(LIBOBJS_SRV))

-LIBOBJS_SRV := $(patsubst snprintf.o,snprintf_srv.o, $(LIBOBJS_SRV))

LIBOBJS_SRV := $(patsubst thread.o,thread_srv.o, $(LIBOBJS_SRV))

all: libpgport.a libpgport_srv.a

diff --git a/src/port/snprintf.c b/src/port/snprintf.c

index 544ab3d78c978b7b596624342be1fdd8b8312b9f..4a8c7534307e82286484193df9e78fe905c5c975 100644 (file)

--- a/src/port/snprintf.c

+++ b/src/port/snprintf.c

@@ -32,17 +32,14 @@

* SUCH DAMAGE.

-#ifndef FRONTEND

#include "postgres.h"

-#else

-#include "postgres_fe.h"

-#endif

#ifndef WIN32

#include <sys/ioctl.h>

#endif

#include <sys/param.h>

** SNPRINTF, VSNPRINT -- counted versions of printf

@@ -65,7 +62,7 @@

* causing nasty effects.

**************************************************************/

-/*static char _id[] = "$PostgreSQL: pgsql/src/port/snprintf.c,v 1.24 2005年03月17日 03:18:14 momjian Exp $";*/

+/*static char _id[] = "$PostgreSQL: pgsql/src/port/snprintf.c,v 1.25 2005年03月20日 03:53:39 momjian Exp $";*/

static void dopr(char *buffer, const char *format, va_list args, char *end);

@@ -227,10 +224,7 @@ dopr(char *buffer, const char *format, va_list args, char *end)

for (p = format; *p != '0円'; p++)

if (*p == '%') /* counts %% as two, so overcounts */

percents++;

-#ifndef FRONTEND

- fmtpar = pgport_palloc(sizeof(struct fmtpar) * percents);

- fmtparptr = pgport_palloc(sizeof(struct fmtpar *) * percents);

-#else

if ((fmtpar = malloc(sizeof(struct fmtpar) * percents)) == NULL)

{

fprintf(stderr, _("out of memory\n"));

@@ -241,7 +235,6 @@ dopr(char *buffer, const char *format, va_list args, char *end)

fprintf(stderr, _("out of memory\n"));

exit(1);

}

-#endif

format_save = format;

@@ -586,13 +579,8 @@ nochar:

}

*output = '0円';

-#ifndef FRONTEND

- pgport_pfree(fmtpar);

- pgport_pfree(fmtparptr);

-#else

free(fmtpar);

free(fmtparptr);

-#endif

}

static void

This is the main PostgreSQL git repository.

RSS Atom