emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

should not produce a red star

Browse Source
This commit is contained in:
Roy Marples 2008-01-21 14:31:21 +00:00
parent a597686ded
commit 28618c8174
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libeinfo/libeinfo.c
View File

@ -816,7 +816,7 @@ static int _do_eend (const char *cmd, int retval, const char *__EINFO_RESTRICT f
FILE *fp = stdout; FILE *fp = stdout;
va_list apc; va_list apc;
if (fmt && retval != 0) { if (fmt && strlen (fmt) > 0 && retval != 0) {
va_copy (apc, ap); va_copy (apc, ap);
if (strcmp (cmd, "ewend") == 0) { if (strcmp (cmd, "ewend") == 0) {
col = _ewarnvn (fmt, apc); col = _ewarnvn (fmt, apc);

38
src/rc/rc-applets.c
View File

@ -75,6 +75,7 @@ static int do_e (int argc, char **argv)
char *message = NULL; char *message = NULL;
char *p; char *p;
int level = 0; int level = 0;
const char *fmt = "%s";
/* Punt applet */ /* Punt applet */
argc--; argc--;
@ -92,7 +93,6 @@ static int do_e (int argc, char **argv)
} }
if (argc > 0) { if (argc > 0) {
if (strcmp (applet, "eend") == 0 || if (strcmp (applet, "eend") == 0 ||
strcmp (applet, "ewend") == 0 || strcmp (applet, "ewend") == 0 ||
strcmp (applet, "veend") == 0 || strcmp (applet, "veend") == 0 ||
@ -140,44 +140,44 @@ static int do_e (int argc, char **argv)
} }
if (! message) if (! message)
message = xstrdup (""); fmt = "";
if (strcmp (applet, "einfo") == 0) if (strcmp (applet, "einfo") == 0)
einfo ("%s", message); einfo (fmt, message);
else if (strcmp (applet, "einfon") == 0) else if (strcmp (applet, "einfon") == 0)
einfon ("%s", message); einfon (fmt, message);
else if (strcmp (applet, "ewarn") == 0) else if (strcmp (applet, "ewarn") == 0)
ewarn ("%s", message); ewarn (fmt, message);
else if (strcmp (applet, "ewarnn") == 0) else if (strcmp (applet, "ewarnn") == 0)
ewarnn ("%s", message); ewarnn (fmt, message);
else if (strcmp (applet, "eerror") == 0) { else if (strcmp (applet, "eerror") == 0) {
eerror ("%s", message); eerror (fmt, message);
retval = 1; retval = 1;
} else if (strcmp (applet, "eerrorn") == 0) { } else if (strcmp (applet, "eerrorn") == 0) {
eerrorn ("%s", message); eerrorn (fmt, message);
retval = 1; retval = 1;
} else if (strcmp (applet, "ebegin") == 0) } else if (strcmp (applet, "ebegin") == 0)
ebegin ("%s", message); ebegin (fmt, message);
else if (strcmp (applet, "eend") == 0) else if (strcmp (applet, "eend") == 0)
eend (retval, "%s", message); eend (retval, fmt, message);
else if (strcmp (applet, "ewend") == 0) else if (strcmp (applet, "ewend") == 0)
ewend (retval, "%s", message); ewend (retval, fmt, message);
else if (strcmp (applet, "esyslog") == 0) else if (strcmp (applet, "esyslog") == 0)
elog (level, "%s", message); elog (level, fmt, message);
else if (strcmp (applet, "veinfo") == 0) else if (strcmp (applet, "veinfo") == 0)
einfov ("%s", message); einfov (fmt, message);
else if (strcmp (applet, "veinfon") == 0) else if (strcmp (applet, "veinfon") == 0)
einfovn ("%s", message); einfovn (fmt, message);
else if (strcmp (applet, "vewarn") == 0) else if (strcmp (applet, "vewarn") == 0)
ewarnv ("%s", message); ewarnv (fmt, message);
else if (strcmp (applet, "vewarnn") == 0) else if (strcmp (applet, "vewarnn") == 0)
ewarnvn ("%s", message); ewarnvn (fmt, message);
else if (strcmp (applet, "vebegin") == 0) else if (strcmp (applet, "vebegin") == 0)
ebeginv ("%s", message); ebeginv (fmt, message);
else if (strcmp (applet, "veend") == 0) else if (strcmp (applet, "veend") == 0)
eendv (retval, "%s", message); eendv (retval, fmt, message);
else if (strcmp (applet, "vewend") == 0) else if (strcmp (applet, "vewend") == 0)
ewendv (retval, "%s", message); ewendv (retval, fmt, message);
else if (strcmp (applet, "eindent") == 0) else if (strcmp (applet, "eindent") == 0)
eindent (); eindent ();
else if (strcmp (applet, "eoutdent") == 0) else if (strcmp (applet, "eoutdent") == 0)