Commit | Line | Data |
---|---|---|
cdc89716 FF |
1 | From 260704a9164dd34cf7128d6b1e88075ffa3be054 Mon Sep 17 00:00:00 2001 |
2 | From: Thien-Thi Nguyen <ttn@gnu.org> | |
3 | Date: Thu, 18 Jun 2015 19:25:53 +0000 | |
4 | Subject: [C slog] Move ‘exiting’ to beginning of func decl. | |
5 | ||
6 | Apparently, ‘gcc --std=c11’ does not abide the ‘exiting’ | |
7 | attribute appearing at the end of the func decl. | |
8 | Reported by Romain Francoise. | |
9 | See also <https://bugs.debian.org/778100>. | |
10 | ||
11 | * src/b-complain.h (generic_fatal, fatal_syntax, fatal_sys) | |
12 | * src/b-fb.h (Ierror, Oerror) | |
13 | * src/base.h (unexpected_EOF, thank_you_and_goodnight): | |
14 | Move ‘exiting’ attribute to beginning of func decl. | |
15 | --- | |
16 | diff --git a/src/b-complain.h b/src/b-complain.h | |
17 | index 0ffd157..ea0ffc5 100644 | |
18 | --- a/src/b-complain.h | |
19 | +++ b/src/b-complain.h | |
20 | @@ -32,12 +32,14 @@ extern void generic_warn (char const *who, char const *fmt, ...) | |
21 | printf_string (2, 3); | |
22 | extern void generic_error (char const *who, char const *fmt, ...) | |
23 | printf_string (2, 3); | |
24 | +exiting | |
25 | extern void generic_fatal (char const *who, char const *fmt, ...) | |
26 | - printf_string (2, 3) exiting; | |
27 | + printf_string (2, 3); | |
28 | +exiting | |
29 | extern void fatal_syntax (size_t lno, char const *fmt, ...) | |
30 | - printf_string (2, 3) exiting; | |
31 | -extern void fatal_sys (char const *who) | |
32 | - exiting; | |
33 | + printf_string (2, 3); | |
34 | +exiting | |
35 | +extern void fatal_sys (char const *who); | |
36 | ||
37 | /* Idioms. Here, prefix P stands for "program" (general operation); | |
38 | M for "manifestation"; R for "repository". */ | |
39 | diff --git a/src/b-fb.h b/src/b-fb.h | |
40 | index c9850e7..bf5eaf8 100644 | |
41 | --- a/src/b-fb.h | |
42 | +++ b/src/b-fb.h | |
43 | @@ -21,9 +21,11 @@ | |
44 | */ | |
45 | ||
46 | extern int change_mode (int fd, mode_t mode); | |
47 | -extern void Ierror (void) exiting; | |
48 | +exiting | |
49 | +extern void Ierror (void); | |
50 | extern void testIerror (FILE *f); | |
51 | -extern void Oerror (void) exiting; | |
52 | +exiting | |
53 | +extern void Oerror (void); | |
54 | extern void testOerror (FILE *o); | |
55 | extern FILE *fopen_safer (char const *filename, char const *type); | |
56 | extern void Ozclose (FILE **p); | |
57 | diff --git a/src/base.h b/src/base.h | |
58 | index 163ee09..5e7a9f8 100644 | |
59 | --- a/src/base.h | |
60 | +++ b/src/base.h | |
61 | @@ -755,8 +755,8 @@ int dorewrite (bool lockflag, int changed); | |
62 | int donerewrite (int changed, time_t newRCStime); | |
63 | void ORCSclose (void); | |
64 | void ORCSerror (void); | |
65 | -void unexpected_EOF (void) | |
66 | - exiting; | |
67 | +exiting | |
68 | +void unexpected_EOF (void); | |
69 | void initdiffcmd (struct diffcmd *dc); | |
70 | int getdiffcmd (struct fro *finfile, bool delimiter, | |
71 | FILE *foutfile, struct diffcmd *dc); | |
72 | @@ -831,8 +831,8 @@ char const *date2str (char const date[datesize], | |
73 | char datebuf[datesize + zonelenmax]); | |
74 | ||
75 | /* rcsutil */ | |
76 | -void thank_you_and_goodnight (int const how) | |
77 | - exiting; | |
78 | +exiting | |
79 | +void thank_you_and_goodnight (int const how); | |
80 | /* These are for ‘thank_you_and_goodnight’. */ | |
81 | #define TYAG_ORCSERROR (1 << 3) | |
82 | #define TYAG_DIRTMPUNLINK (1 << 2) | |
83 | -- | |
84 | cgit v0.9.0.2 |