Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Doug Goldstein (cardoe)" <cardoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/openrc/files/0.3.0: 0007-Fix-utmp-permissions-Gentoo-240437.patch 0006-Fix-tests-Gentoo-240350.patch 0008-Clean-up-warnings-regarding-printf.patch
Date: Wed, 08 Oct 2008 16:21:48
Message-Id: E1Knbkm-0004ug-0X@stork.gentoo.org
1 cardoe 08/10/08 16:19:12
2
3 Added: 0007-Fix-utmp-permissions-Gentoo-240437.patch
4 0006-Fix-tests-Gentoo-240350.patch
5 0008-Clean-up-warnings-regarding-printf.patch
6 Log:
7 fix bugs #240350, #240437. Fix printf warnings. Remove dead patch.
8 (Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)
9
10 Revision Changes Path
11 1.1 sys-apps/openrc/files/0.3.0/0007-Fix-utmp-permissions-Gentoo-240437.patch
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/0.3.0/0007-Fix-utmp-permissions-Gentoo-240437.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/0.3.0/0007-Fix-utmp-permissions-Gentoo-240437.patch?rev=1.1&content-type=text/plain
15
16 Index: 0007-Fix-utmp-permissions-Gentoo-240437.patch
17 ===================================================================
18 From a327a7d1e795fb6d6c49a459f5863d9d1fdc0b9c Mon Sep 17 00:00:00 2001
19 From: Roy Marples <roy@×××××××.name>
20 Date: Wed, 8 Oct 2008 14:58:17 +0100
21 Subject: [PATCH] Fix utmp permissions, Gentoo #240437.
22
23 ---
24 init.d/bootmisc.in | 5 ++++-
25 1 files changed, 4 insertions(+), 1 deletions(-)
26
27 diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
28 index 50e83a0..529097e 100644
29 --- a/init.d/bootmisc.in
30 +++ b/init.d/bootmisc.in
31 @@ -77,10 +77,13 @@ start()
32 if dir_writeable /var/run; then
33 ebegin "Creating user login records"
34 cp /dev/null /var/run/utmp
35 + chgrp utmp /var/run/utmp
36 + chmod 0664 /var/run/utmp
37 if dir_writeable /var/log; then
38 logw=true
39 [ -e /var/log/wtmp ] || cp /dev/null /var/log/wtmp
40 - chmod 0644 /var/run/utmp /var/log/wtmp
41 + chgrp utmp /var/log/wtmp
42 + chmod 0664 /var/log/wtmp
43 fi
44 eend 0
45
46 --
47 1.6.0.2
48
49
50
51
52 1.1 sys-apps/openrc/files/0.3.0/0006-Fix-tests-Gentoo-240350.patch
53
54 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/0.3.0/0006-Fix-tests-Gentoo-240350.patch?rev=1.1&view=markup
55 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/0.3.0/0006-Fix-tests-Gentoo-240350.patch?rev=1.1&content-type=text/plain
56
57 Index: 0006-Fix-tests-Gentoo-240350.patch
58 ===================================================================
59 From 86a3baa490d1d84f764b2f4b081d5abfc437b496 Mon Sep 17 00:00:00 2001
60 From: Roy Marples <roy@×××××××.name>
61 Date: Tue, 7 Oct 2008 13:14:53 +0100
62 Subject: [PATCH] Fix tests, #Gentoo 240350.
63
64 ---
65 src/test/librc.funcs.hidden.list | 2 ++
66 src/test/rc.funcs.list | 4 ++++
67 2 files changed, 6 insertions(+), 0 deletions(-)
68
69 diff --git a/src/test/librc.funcs.hidden.list b/src/test/librc.funcs.hidden.list
70 index 15249ad..2416a0c 100644
71 --- a/src/test/librc.funcs.hidden.list
72 +++ b/src/test/librc.funcs.hidden.list
73 @@ -41,8 +41,10 @@ rc_services_scheduled_by
74 rc_stringlist_add
75 rc_stringlist_addu
76 rc_stringlist_delete
77 +rc_stringlist_find
78 rc_stringlist_free
79 rc_stringlist_new
80 rc_stringlist_sort
81 +rc_stringlist_split
82 rc_sys
83 rc_yesno
84 diff --git a/src/test/rc.funcs.list b/src/test/rc.funcs.list
85 index 85cf936..f632474 100644
86 --- a/src/test/rc.funcs.list
87 +++ b/src/test/rc.funcs.list
88 @@ -82,12 +82,16 @@ rc_stringlist_addu
89 rc_stringlist_addu@@RC_1.0
90 rc_stringlist_delete
91 rc_stringlist_delete@@RC_1.0
92 +rc_stringlist_find
93 +rc_stringlist_find@@RC_1.0
94 rc_stringlist_free
95 rc_stringlist_free@@RC_1.0
96 rc_stringlist_new
97 rc_stringlist_new@@RC_1.0
98 rc_stringlist_sort
99 rc_stringlist_sort@@RC_1.0
100 +rc_stringlist_split
101 +rc_stringlist_split@@RC_1.0
102 rc_sys
103 rc_sys@@RC_1.0
104 rc_yesno
105 --
106 1.6.0.2
107
108
109
110
111 1.1 sys-apps/openrc/files/0.3.0/0008-Clean-up-warnings-regarding-printf.patch
112
113 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/0.3.0/0008-Clean-up-warnings-regarding-printf.patch?rev=1.1&view=markup
114 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/0.3.0/0008-Clean-up-warnings-regarding-printf.patch?rev=1.1&content-type=text/plain
115
116 Index: 0008-Clean-up-warnings-regarding-printf.patch
117 ===================================================================
118 From ca7651e9ee42b222ec4fd1b30f4e9ba8eb0ffc37 Mon Sep 17 00:00:00 2001
119 From: Roy Marples <roy@×××××××.name>
120 Date: Wed, 8 Oct 2008 16:56:47 +0100
121 Subject: [PATCH] Clean up warnings regarding printf.
122
123 ---
124 src/libeinfo/einfo.h | 66 ++++++++++++++++++++++------------------------
125 src/libeinfo/libeinfo.c | 63 ++++++++++++++++++++++----------------------
126 src/rc/rc-applets.c | 11 ++++---
127 src/rc/runscript.c | 2 +-
128 4 files changed, 70 insertions(+), 72 deletions(-)
129
130 diff --git a/src/libeinfo/einfo.h b/src/libeinfo/einfo.h
131 index 3934b58..9c54e68 100644
132 --- a/src/libeinfo/einfo.h
133 +++ b/src/libeinfo/einfo.h
134 @@ -28,13 +28,11 @@
135 #define __EINFO_H__
136
137 #if defined(__GNUC__)
138 -# define __EINFO_PRINTF __attribute__ ((__format__ (__printf__, 1, 2)))
139 -# define __EINFO_XPRINTF __attribute__ ((__noreturn__, __format__ (__printf__, 1, 2)))
140 -# define __EEND_PRINTF __attribute__ ((__format__ (__printf__, 2, 3)))
141 +# define EINFO_PRINTF(a, b) __attribute__((__format__(__printf__, a, b)))
142 +# define EINFO_XPRINTF(a, b) __attribute__((__noreturn__,__format__(__printf__, a, b)))
143 #else
144 -# define __EINFO_PRINTF
145 -# define __EINFO_XPRINTF
146 -# define __EEND_PRINTF
147 +# define EINFO_PRINTF(a, b)
148 +# define EINFO_XPRINTF(a, b)
149 #endif
150
151 #include <sys/types.h>
152 @@ -42,12 +40,12 @@
153
154 /* Although OpenRC requires C99, linking to us should not. */
155 #ifdef restrict
156 -# define __EINFO_RESTRICT restrict
157 +# define EINFO_RESTRICT restrict
158 #else
159 # ifdef __restrict
160 -# define __EINFO_RESTRICT __restrict
161 +# define EINFO_RESTRICT __restrict
162 # else
163 -# define __EINFO_RESTRICT
164 +# define EINFO_RESTRICT
165 # endif
166 #endif
167
168 @@ -68,7 +66,7 @@ typedef enum
169 const char *ecolor(ECOLOR);
170
171 /*! @brief Writes to syslog. */
172 -void elog(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF;
173 +void elog(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3);
174
175 /*!
176 * @brief Display informational messages.
177 @@ -86,22 +84,22 @@ void elog(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF;
178 * The v suffix means only print if EINFO_VERBOSE is yes.
179 */
180 /*@{*/
181 -int einfon(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
182 -int ewarnn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
183 -int eerrorn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
184 -int einfo(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
185 -int ewarn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
186 -void ewarnx(const char * __EINFO_RESTRICT, ...) __EINFO_XPRINTF;
187 -int eerror(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
188 -void eerrorx(const char * __EINFO_RESTRICT, ...) __EINFO_XPRINTF;
189 -
190 -int einfovn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
191 -int ewarnvn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
192 -int ebeginvn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
193 -int eendvn(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF;
194 -int ewendvn(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF;
195 -int einfov(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
196 -int ewarnv(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
197 +int einfon(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
198 +int ewarnn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
199 +int eerrorn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
200 +int einfo(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
201 +int ewarn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
202 +void ewarnx(const char * __EINFO_RESTRICT, ...) EINFO_XPRINTF(1, 2);
203 +int eerror(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
204 +void eerrorx(const char * __EINFO_RESTRICT, ...) EINFO_XPRINTF(1, 2);
205 +
206 +int einfovn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
207 +int ewarnvn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
208 +int ebeginvn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
209 +int eendvn(int, const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3);
210 +int ewendvn(int, const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3);
211 +int einfov(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
212 +int ewarnv(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
213 /*@}*/
214
215 /*! @ingroup ebegin
216 @@ -109,8 +107,8 @@ int ewarnv(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
217 *
218 * Similar to einfo, but we add ... to the end of the message */
219 /*@{*/
220 -int ebeginv(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
221 -int ebegin(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
222 +int ebeginv(const char * EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
223 +int ebegin(const char * EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2);
224 /*@}*/
225
226 /*! @ingroup eend
227 @@ -122,12 +120,12 @@ int ebegin(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF;
228 *
229 * ebracket allows you to specifiy the position, color and message */
230 /*@{*/
231 -int eend(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF;
232 -int ewend(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF;
233 -void ebracket(int, ECOLOR, const char * __EINFO_RESTRICT);
234 +int eend(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3);
235 +int ewend(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3);
236 +void ebracket(int, ECOLOR, const char * EINFO_RESTRICT);
237
238 -int eendv(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF;
239 -int ewendv(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF;
240 +int eendv(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3);
241 +int ewendv(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3);
242 /*@}*/
243
244 /*! @ingroup eindent
245 @@ -141,7 +139,7 @@ void eindentv(void);
246 void eoutdentv(void);
247
248 /*! @brief Prefix each einfo line with something */
249 -void eprefix(const char * __EINFO_RESTRICT);
250 +void eprefix(const char * EINFO_RESTRICT);
251
252 __END_DECLS
253 #endif
254 diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c
255 index a5977b7..7dd2ef6 100644
256 --- a/src/libeinfo/libeinfo.c
257 +++ b/src/libeinfo/libeinfo.c
258 @@ -316,7 +316,7 @@ tgoto(const char *cap, int a, int b)
259 #endif
260
261 static bool
262 -colour_terminal(FILE * __EINFO_RESTRICT f)
263 +colour_terminal(FILE * EINFO_RESTRICT f)
264 {
265 static int in_colour = -1;
266 char *e, *ee, *end, *d, *p;
267 @@ -460,7 +460,7 @@ colour_terminal(FILE * __EINFO_RESTRICT f)
268 }
269
270 static int
271 -get_term_columns(FILE * __EINFO_RESTRICT stream)
272 +get_term_columns(FILE * EINFO_RESTRICT stream)
273 {
274 struct winsize ws;
275 char *env = getenv("COLUMNS");
276 @@ -480,14 +480,14 @@ get_term_columns(FILE * __EINFO_RESTRICT stream)
277 }
278
279 void
280 -eprefix(const char *__EINFO_RESTRICT prefix)
281 +eprefix(const char *EINFO_RESTRICT prefix)
282 {
283 _eprefix = prefix;
284 }
285 hidden_def(eprefix)
286
287 -static void
288 -elogv(int level, const char *__EINFO_RESTRICT fmt, va_list ap)
289 +static void EINFO_PRINTF(2, 0)
290 +elogv(int level, const char *EINFO_RESTRICT fmt, va_list ap)
291 {
292 char *e = getenv("EINFO_LOG");
293 va_list apc;
294 @@ -503,7 +503,7 @@ elogv(int level, const char *__EINFO_RESTRICT fmt, va_list ap)
295 }
296
297 void
298 -elog(int level, const char *__EINFO_RESTRICT fmt, ...)
299 +elog(int level, const char *EINFO_RESTRICT fmt, ...)
300 {
301 va_list ap;
302
303 @@ -514,7 +514,7 @@ elog(int level, const char *__EINFO_RESTRICT fmt, ...)
304 hidden_def(elog)
305
306 static int
307 -_eindent(FILE * __EINFO_RESTRICT stream)
308 +_eindent(FILE * EINFO_RESTRICT stream)
309 {
310 char *env = getenv("EINFO_INDENT");
311 int amount = 0;
312 @@ -538,7 +538,7 @@ _eindent(FILE * __EINFO_RESTRICT stream)
313 }
314
315 static const char *
316 -_ecolor(FILE * __EINFO_RESTRICT f, ECOLOR color)
317 +_ecolor(FILE * EINFO_RESTRICT f, ECOLOR color)
318 {
319 unsigned int i;
320
321 @@ -575,9 +575,8 @@ ecolor(ECOLOR color)
322 setenv("EINFO_LASTCMD", _cmd, 1); \
323 }
324
325 -static int
326 -_einfo(FILE *f, ECOLOR color, const char *__EINFO_RESTRICT fmt, va_list va)
327 -
328 +static int EINFO_PRINTF(3, 0)
329 +_einfo(FILE *f, ECOLOR color, const char *EINFO_RESTRICT fmt, va_list va)
330 {
331 int retval = 0;
332 char *last = getenv("EINFO_LASTCMD");
333 @@ -605,7 +604,7 @@ _einfo(FILE *f, ECOLOR color, const char *__EINFO_RESTRICT fmt, va_list va)
334 #define _eerrorvn(fmt, ap) _einfo(stderr, ECOLOR_BAD, fmt, ap)
335
336 int
337 -einfon(const char *__EINFO_RESTRICT fmt, ...)
338 +einfon(const char *EINFO_RESTRICT fmt, ...)
339 {
340 int retval;
341 va_list ap;
342 @@ -621,7 +620,7 @@ einfon(const char *__EINFO_RESTRICT fmt, ...)
343 hidden_def(einfon)
344
345 int
346 -ewarnn(const char *__EINFO_RESTRICT fmt, ...)
347 +ewarnn(const char *EINFO_RESTRICT fmt, ...)
348 {
349 int retval;
350 va_list ap;
351 @@ -637,7 +636,7 @@ ewarnn(const char *__EINFO_RESTRICT fmt, ...)
352 hidden_def(ewarnn)
353
354 int
355 -eerrorn(const char *__EINFO_RESTRICT fmt, ...)
356 +eerrorn(const char *EINFO_RESTRICT fmt, ...)
357 {
358 int retval;
359 va_list ap;
360 @@ -651,7 +650,7 @@ eerrorn(const char *__EINFO_RESTRICT fmt, ...)
361 hidden_def(eerrorn)
362
363 int
364 -einfo(const char *__EINFO_RESTRICT fmt, ...)
365 +einfo(const char *EINFO_RESTRICT fmt, ...)
366 {
367 int retval;
368 va_list ap;
369 @@ -668,7 +667,7 @@ einfo(const char *__EINFO_RESTRICT fmt, ...)
370 hidden_def(einfo)
371
372 int
373 -ewarn(const char *__EINFO_RESTRICT fmt, ...)
374 +ewarn(const char *EINFO_RESTRICT fmt, ...)
375 {
376 int retval;
377 va_list ap;
378 @@ -686,7 +685,7 @@ ewarn(const char *__EINFO_RESTRICT fmt, ...)
379 hidden_def(ewarn)
380
381 void
382 -ewarnx(const char *__EINFO_RESTRICT fmt, ...)
383 +ewarnx(const char *EINFO_RESTRICT fmt, ...)
384 {
385 int retval;
386 va_list ap;
387 @@ -703,7 +702,7 @@ ewarnx(const char *__EINFO_RESTRICT fmt, ...)
388 hidden_def(ewarnx)
389
390 int
391 -eerror(const char *__EINFO_RESTRICT fmt, ...)
392 +eerror(const char *EINFO_RESTRICT fmt, ...)
393 {
394 int retval;
395 va_list ap;
396 @@ -721,7 +720,7 @@ eerror(const char *__EINFO_RESTRICT fmt, ...)
397 hidden_def(eerror)
398
399 void
400 -eerrorx(const char *__EINFO_RESTRICT fmt, ...)
401 +eerrorx(const char *EINFO_RESTRICT fmt, ...)
402 {
403 va_list ap;
404
405 @@ -737,7 +736,7 @@ eerrorx(const char *__EINFO_RESTRICT fmt, ...)
406 hidden_def(eerrorx)
407
408 int
409 -ebegin(const char *__EINFO_RESTRICT fmt, ...)
410 +ebegin(const char *EINFO_RESTRICT fmt, ...)
411 {
412 int retval;
413 va_list ap;
414 @@ -756,7 +755,7 @@ ebegin(const char *__EINFO_RESTRICT fmt, ...)
415 hidden_def(ebegin)
416
417 static void
418 -_eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
419 +_eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
420 {
421 int i;
422 int cols;
423 @@ -790,8 +789,8 @@ _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
424 }
425 }
426
427 -static int
428 -_do_eend(const char *cmd, int retval, const char *__EINFO_RESTRICT fmt, va_list ap)
429 +static int EINFO_PRINTF(3, 0)
430 +_do_eend(const char *cmd, int retval, const char *EINFO_RESTRICT fmt, va_list ap)
431 {
432 int col = 0;
433 FILE *fp = stdout;
434 @@ -814,7 +813,7 @@ _do_eend(const char *cmd, int retval, const char *__EINFO_RESTRICT fmt, va_list
435 }
436
437 int
438 -eend(int retval, const char *__EINFO_RESTRICT fmt, ...)
439 +eend(int retval, const char *EINFO_RESTRICT fmt, ...)
440 {
441 va_list ap;
442
443 @@ -829,7 +828,7 @@ eend(int retval, const char *__EINFO_RESTRICT fmt, ...)
444 hidden_def(eend)
445
446 int
447 -ewend(int retval, const char *__EINFO_RESTRICT fmt, ...)
448 +ewend(int retval, const char *EINFO_RESTRICT fmt, ...)
449 {
450 va_list ap;
451
452 @@ -897,7 +896,7 @@ void eoutdent(void)
453 hidden_def(eoutdent)
454
455 int
456 -einfovn(const char *__EINFO_RESTRICT fmt, ...)
457 +einfovn(const char *EINFO_RESTRICT fmt, ...)
458 {
459 int retval;
460 va_list ap;
461 @@ -913,7 +912,7 @@ einfovn(const char *__EINFO_RESTRICT fmt, ...)
462 hidden_def(einfovn)
463
464 int
465 -ewarnvn(const char *__EINFO_RESTRICT fmt, ...)
466 +ewarnvn(const char *EINFO_RESTRICT fmt, ...)
467 {
468 int retval;
469 va_list ap;
470 @@ -929,7 +928,7 @@ ewarnvn(const char *__EINFO_RESTRICT fmt, ...)
471 hidden_def(ewarnvn)
472
473 int
474 -einfov(const char *__EINFO_RESTRICT fmt, ...)
475 +einfov(const char *EINFO_RESTRICT fmt, ...)
476 {
477 int retval;
478 va_list ap;
479 @@ -946,7 +945,7 @@ einfov(const char *__EINFO_RESTRICT fmt, ...)
480 hidden_def(einfov)
481
482 int
483 -ewarnv(const char *__EINFO_RESTRICT fmt, ...)
484 +ewarnv(const char *EINFO_RESTRICT fmt, ...)
485 {
486 int retval;
487 va_list ap;
488 @@ -963,7 +962,7 @@ ewarnv(const char *__EINFO_RESTRICT fmt, ...)
489 hidden_def(ewarnv)
490
491 int
492 -ebeginv(const char *__EINFO_RESTRICT fmt, ...)
493 +ebeginv(const char *EINFO_RESTRICT fmt, ...)
494 {
495 int retval;
496 va_list ap;
497 @@ -983,7 +982,7 @@ ebeginv(const char *__EINFO_RESTRICT fmt, ...)
498 hidden_def(ebeginv)
499
500 int
501 -eendv(int retval, const char *__EINFO_RESTRICT fmt, ...)
502 +eendv(int retval, const char *EINFO_RESTRICT fmt, ...)
503 {
504 va_list ap;
505
506 @@ -998,7 +997,7 @@ eendv(int retval, const char *__EINFO_RESTRICT fmt, ...)
507 hidden_def(eendv)
508
509 int
510 -ewendv(int retval, const char *__EINFO_RESTRICT fmt, ...)
511 +ewendv(int retval, const char *EINFO_RESTRICT fmt, ...)
512 {
513 va_list ap;
514
515 diff --git a/src/rc/rc-applets.c b/src/rc/rc-applets.c
516 index f5892f9..eea4a01 100644
517 --- a/src/rc/rc-applets.c
518 +++ b/src/rc/rc-applets.c
519 @@ -84,8 +84,8 @@ static int do_e(int argc, char **argv)
520 int level = 0;
521 struct timespec ts;
522 struct timeval stop, now;
523 - int (*e) (const char *, ...) __EINFO_PRINTF = NULL;
524 - int (*ee) (int, const char *, ...) __EEND_PRINTF = NULL;
525 + int (*e) (const char *, ...) EINFO_PRINTF(1, 2) = NULL;
526 + int (*ee) (int, const char *, ...) EINFO_PRINTF(2, 3) = NULL;
527
528 /* Punt applet */
529 argc--;
530 @@ -205,9 +205,10 @@ static int do_e(int argc, char **argv)
531 ee = eend;
532 else if (strcmp(applet, "ewend") == 0)
533 ee = ewend;
534 - else if (strcmp(applet, "esyslog") == 0)
535 - ee = elog;
536 - else if (strcmp(applet, "veinfo") == 0)
537 + else if (strcmp(applet, "esyslog") == 0) {
538 + elog(retval, "%s", message);
539 + retval = 0;
540 + } else if (strcmp(applet, "veinfo") == 0)
541 e = einfov;
542 else if (strcmp(applet, "veinfon") == 0)
543 e = einfovn;
544 diff --git a/src/rc/runscript.c b/src/rc/runscript.c
545 index c04f967..211beff 100644
546 --- a/src/rc/runscript.c
547 +++ b/src/rc/runscript.c
548 @@ -556,7 +556,7 @@ static bool svc_wait(const char *svc)
549 static RC_SERVICE svc_status(void)
550 {
551 char status[10];
552 - int (*e) (const char *fmt, ...) __EINFO_PRINTF = einfo;
553 + int (*e) (const char *fmt, ...) EINFO_PRINTF(1, 2) = einfo;
554 RC_SERVICE state = rc_service_state(service);
555
556 if (state & RC_SERVICE_STOPPING) {
557 --
558 1.6.0.2
Report Message
Find on MARC Find on Google Groups