From 88a6ac9f93b138d39d08b9882b377539edf985f4 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 31 Jan 2012 20:47:43 +0200 Subject: [PATCH] pg_dump: Add GCC noreturn attribute to appropriate functions This is a small help to the compiler and static analyzers. --- src/bin/pg_dump/dumputils.h | 2 +- src/bin/pg_dump/pg_backup_archiver.c | 2 +- src/bin/pg_dump/pg_backup_archiver.h | 2 +- src/bin/pg_dump/pg_dump.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/pg_dump/dumputils.h b/src/bin/pg_dump/dumputils.h index b4cf730b4a8..de1536baaa0 100644 --- 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 234e50fb734..d55e0940f59 100644 --- 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 6dd5158ab4d..083a65b9754 100644 --- 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 071512077cd..d3074d552c7 100644 --- 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);