1 From 260704a9164dd34cf7128d6b1e88075ffa3be054 Mon Sep 17 00:00:00 2001
2 From: Thien-Thi Nguyen <address@hidden>
3 Date: Thu, 18 Jun 2015 21:25:53 +0200
4 Subject: [PATCH] =?UTF-8?q?[C=20slog]=20Move=20=E2=80=98exiting=E2=80=99?=
5 =?UTF-8?q?=20to=20beginning=20of=20func=20decl.?=
7 Content-Type: text/plain; charset=UTF-8
8 Content-Transfer-Encoding: 8bit
10 Apparently, ‘gcc --std=c11’ does not abide the ‘exiting’
11 attribute appearing at the end of the func decl.
12 Reported by Romain Francoise.
13 See also <https://bugs.debian.org/778100>.
15 * src/b-complain.h (generic_fatal, fatal_syntax, fatal_sys)
16 * src/b-fb.h (Ierror, Oerror)
17 * src/base.h (unexpected_EOF, thank_you_and_goodnight):
18 Move ‘exiting’ attribute to beginning of func decl.
20 src/ChangeLog | 14 ++++++++++++++
21 src/b-complain.h | 10 ++++++----
23 src/base.h | 8 ++++----
24 4 files changed, 28 insertions(+), 10 deletions(-)
26 diff --git a/src/ChangeLog b/src/ChangeLog
27 index bb31f05..a2ef6a3 100644
31 +2015-06-18 Thien-Thi Nguyen <address@hidden>
33 + [C slog] Move ‘exiting’ to beginning of func decl.
35 + Apparently, ‘gcc --std=c11’ does not abide the ‘exiting’
36 + attribute appearing at the end of the func decl.
37 + Reported by Romain Francoise.
38 + See also <https://bugs.debian.org/778100>.
40 + * b-complain.h (generic_fatal, fatal_syntax, fatal_sys)
41 + * b-fb.h (Ierror, Oerror)
42 + * base.h (unexpected_EOF, thank_you_and_goodnight):
43 + Move ‘exiting’ attribute to beginning of func decl.
45 2015-01-22 Thien-Thi Nguyen <ttn@gnu.org>
48 diff --git a/src/b-complain.h b/src/b-complain.h
49 index 0ffd157..ea0ffc5 100644
50 --- a/src/b-complain.h
51 +++ b/src/b-complain.h
52 @@ -32,12 +32,14 @@ extern void generic_warn (char const *who, char const *fmt, ...)
54 extern void generic_error (char const *who, char const *fmt, ...)
57 extern void generic_fatal (char const *who, char const *fmt, ...)
58 - printf_string (2, 3) exiting;
59 + printf_string (2, 3);
61 extern void fatal_syntax (size_t lno, char const *fmt, ...)
62 - printf_string (2, 3) exiting;
63 -extern void fatal_sys (char const *who)
65 + printf_string (2, 3);
67 +extern void fatal_sys (char const *who);
69 /* Idioms. Here, prefix P stands for "program" (general operation);
70 M for "manifestation"; R for "repository". */
71 diff --git a/src/b-fb.h b/src/b-fb.h
72 index c9850e7..bf5eaf8 100644
78 extern int change_mode (int fd, mode_t mode);
79 -extern void Ierror (void) exiting;
81 +extern void Ierror (void);
82 extern void testIerror (FILE *f);
83 -extern void Oerror (void) exiting;
85 +extern void Oerror (void);
86 extern void testOerror (FILE *o);
87 extern FILE *fopen_safer (char const *filename, char const *type);
88 extern void Ozclose (FILE **p);
89 diff --git a/src/base.h b/src/base.h
90 index 163ee09..5e7a9f8 100644
93 @@ -755,8 +755,8 @@ int dorewrite (bool lockflag, int changed);
94 int donerewrite (int changed, time_t newRCStime);
95 void ORCSclose (void);
96 void ORCSerror (void);
97 -void unexpected_EOF (void)
100 +void unexpected_EOF (void);
101 void initdiffcmd (struct diffcmd *dc);
102 int getdiffcmd (struct fro *finfile, bool delimiter,
103 FILE *foutfile, struct diffcmd *dc);
104 @@ -831,8 +831,8 @@ char const *date2str (char const date[datesize],
105 char datebuf[datesize + zonelenmax]);
108 -void thank_you_and_goodnight (int const how)
111 +void thank_you_and_goodnight (int const how);
112 /* These are for ‘thank_you_and_goodnight’. */
113 #define TYAG_ORCSERROR (1 << 3)
114 #define TYAG_DIRTMPUNLINK (1 << 2)