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

git projects / postgresql.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5ae88c6)

pg_dump: Add GCC noreturn attribute to appropriate functions

author Peter Eisentraut <peter_e@gmx.net>

2012年1月31日 18:47:43 +0000 (20:47 +0200)

committer Peter Eisentraut <peter_e@gmx.net>

2012年1月31日 18:49:10 +0000 (20:49 +0200)

This is a small help to the compiler and static analyzers.

src/bin/pg_dump/dumputils.h patch | blob | blame | history

src/bin/pg_dump/pg_backup_archiver.c patch | blob | blame | history

src/bin/pg_dump/pg_backup_archiver.h patch | blob | blame | history

src/bin/pg_dump/pg_dump.h patch | blob | blame | history

diff --git a/src/bin/pg_dump/dumputils.h b/src/bin/pg_dump/dumputils.h

index b4cf730b4a86a87bb427ea8c37633f15b0e166c7..de1536baaa0f441db7960dba034921e99c540012 100644 (file)

--- a/src/bin/pg_dump/dumputils.h

+++ b/src/bin/pg_dump/dumputils.h

@@ -57,7 +57,7 @@ extern void write_msg(const char *modulename, const char *fmt,...)

extern void vwrite_msg(const char *modulename, const char *fmt, va_list ap)

__attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 0)));

extern void exit_horribly(const char *modulename, const char *fmt,...)

- __attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));

+ __attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3), noreturn));

extern void set_section (const char *arg, int *dumpSections);

#endif /* DUMPUTILS_H */

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c

index 234e50fb734573f9f3287d952821702a0838c4fd..d55e0940f596c38be0878f398ee619f4cb88391f 100644 (file)

--- a/src/bin/pg_dump/pg_backup_archiver.c

+++ b/src/bin/pg_dump/pg_backup_archiver.c

@@ -123,7 +123,7 @@ static int RestoringToDB(ArchiveHandle *AH);

static void dump_lo_buf(ArchiveHandle *AH);

static void vdie_horribly(ArchiveHandle *AH, const char *modulename,

const char *fmt, va_list ap)

- __attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 0)));

+ __attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 0), noreturn));

static void dumpTimestamp(ArchiveHandle *AH, const char *msg, time_t tim);

static void SetOutput(ArchiveHandle *AH, char *filename, int compression);

diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h

index 6dd5158ab4d9f7ee815e555029839190f335d9a1..083a65b97541e5d724c71987aff35b5f729baf22 100644 (file)

--- a/src/bin/pg_dump/pg_backup_archiver.h

+++ b/src/bin/pg_dump/pg_backup_archiver.h

@@ -325,7 +325,7 @@ typedef struct _tocEntry

} TocEntry;

-extern void die_horribly(ArchiveHandle *AH, const char *modulename, const char *fmt,...) __attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 4)));

+extern void die_horribly(ArchiveHandle *AH, const char *modulename, const char *fmt,...) __attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 4), noreturn));

extern void warn_or_die_horribly(ArchiveHandle *AH, const char *modulename, const char *fmt,...) __attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 4)));

extern void WriteTOC(ArchiveHandle *AH);

diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h

index 071512077cdc32f7d9186f9bede876c106d94bd4..d3074d552c74353199bfd48b0bc571f54ae4a101 100644 (file)

--- a/src/bin/pg_dump/pg_dump.h

+++ b/src/bin/pg_dump/pg_dump.h

@@ -524,7 +524,7 @@ extern void simple_string_list_append(SimpleStringList *list, const char *val);

extern bool simple_oid_list_member(SimpleOidList *list, Oid val);

extern bool simple_string_list_member(SimpleStringList *list, const char *val);

-extern void exit_nicely(void);

+extern void exit_nicely(void) __attribute__((noreturn));

extern void parseOidArray(const char *str, Oid *array, int arraysize);

This is the main PostgreSQL git repository.