[Initng-svn] r2349 - in initng: plugins/inetd plugins/initctl
plugins/logfile plugins/ngc2 plugins/pause plugins/pidfile
plugins/renice src tools
svn at initng.thinktux.net
svn at initng.thinktux.net
Tue Dec 6 02:07:44 CET 2005
Author: deac
Date: Tue Dec 6 02:07:40 2005
New Revision: 2349
Modified:
initng/plugins/inetd/initng_inetd.c
initng/plugins/initctl/initng_initctl.c
initng/plugins/logfile/initng_logfile.c
initng/plugins/ngc2/initng_ngc2.c
initng/plugins/pause/initng_pause.c
initng/plugins/pidfile/initng_pidfile.c
initng/plugins/renice/initng_renice.c
initng/src/initng_active_db.c
initng/src/initng_error.c
initng/src/initng_main.c
initng/src/initng_plugin_hook.c
initng/src/initng_service_cache.c
initng/src/initng_struct_data.c
initng/tools/install_service.c
Log:
clean up output. \n at the end of all [DFPW]_.
Modified: initng/plugins/inetd/initng_inetd.c
==============================================================================
--- initng/plugins/inetd/initng_inetd.c (original)
+++ initng/plugins/inetd/initng_inetd.c Tue Dec 6 02:07:40 2005
@@ -145,8 +145,7 @@
{
D_("module_init(ngc2);\n"); if (strcmp(version, INITNG_VERSION) != 0)
{
- F_
- ("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n",
+ F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n",
INITNG_VERSION, version); return (FALSE);}
Modified: initng/plugins/initctl/initng_initctl.c
==============================================================================
--- initng/plugins/initctl/initng_initctl.c (original)
+++ initng/plugins/initctl/initng_initctl.c Tue Dec 6 02:07:40 2005
@@ -188,7 +188,7 @@
stop_all();
return;
default:
- D_("Starting runlevel%c ", request.runlevel);
+ D_("Starting runlevel%c\n", request.runlevel);
{
char tmp[20];
Modified: initng/plugins/logfile/initng_logfile.c
==============================================================================
--- initng/plugins/logfile/initng_logfile.c (original)
+++ initng/plugins/logfile/initng_logfile.c Tue Dec 6 02:07:40 2005
@@ -69,7 +69,7 @@
/* No free service found */
if (foundfree == 0)
{
- F_("Service database full!");
+ F_("Service database full!\n");
return (FALSE);
}
D_("Allocating new service\n");
Modified: initng/plugins/ngc2/initng_ngc2.c
==============================================================================
--- initng/plugins/ngc2/initng_ngc2.c (original)
+++ initng/plugins/ngc2/initng_ngc2.c Tue Dec 6 02:07:40 2005
@@ -337,7 +337,7 @@
F_("failed to send all data\n");
/* TODO: really continue?? */
- F_("Invalid command type '%c', ling '%s', option : \"%s\"",
+ F_("Invalid command type '%c', ling '%s', option : \"%s\"\n",
header.c, header.l, header.o);
return;
}
Modified: initng/plugins/pause/initng_pause.c
==============================================================================
--- initng/plugins/pause/initng_pause.c (original)
+++ initng/plugins/pause/initng_pause.c Tue Dec 6 02:07:40 2005
@@ -52,7 +52,7 @@
assert(s);
assert(p);
- D_(" %s ", s->name);
+ D_(" %s\n", s->name);
if (p->pt == &T_START || p->pt == &T_DAEMON)
{
Modified: initng/plugins/pidfile/initng_pidfile.c
==============================================================================
--- initng/plugins/pidfile/initng_pidfile.c (original)
+++ initng/plugins/pidfile/initng_pidfile.c Tue Dec 6 02:07:40 2005
@@ -176,7 +176,7 @@
/* If we cant open pidfile, this is bad */
if (fd == -1)
{
- W_("Unable to open pidfile: %s, \"%s\", it might not be created yet.",
+ W_("Unable to open pidfile: %s, \"%s\", it might not be created yet.\n",
name, strerror(errno));
return (-1);
}
Modified: initng/plugins/renice/initng_renice.c
==============================================================================
--- initng/plugins/renice/initng_renice.c (original)
+++ initng/plugins/renice/initng_renice.c Tue Dec 6 02:07:40 2005
@@ -47,7 +47,7 @@
errno = 0;
if (nice(active_db_get_int(&NICE, s)) == -1 && errno != 0)
{
- F_("Failed to set the nice value: %s", strerror(errno));
+ F_("Failed to set the nice value: %s\n", strerror(errno));
return FALSE;
}
}
Modified: initng/src/initng_active_db.c
==============================================================================
--- initng/src/initng_active_db.c (original)
+++ initng/src/initng_active_db.c Tue Dec 6 02:07:40 2005
@@ -49,7 +49,7 @@
{
active_h *current = NULL;
- D_("(%s);", (char*)service);
+ D_("(%s);\n", (char*)service);
assert(service);
@@ -75,7 +75,7 @@
assert(service);
active_h *current = NULL;
- D_("(%s);", (char*)service);
+ D_("(%s);\n", (char*)service);
/* first give the exact find a shot */
if ((current = active_db_find_by_exact_name(service)))
@@ -108,7 +108,7 @@
assert(service);
- D_("(%s);", (char*)service);
+ D_("(%s);\n", (char*)service);
/* first search by name */
if ((current = active_db_find_by_name(service)))
Modified: initng/src/initng_error.c
==============================================================================
--- initng/src/initng_error.c (original)
+++ initng/src/initng_error.c Tue Dec 6 02:07:40 2005
@@ -125,7 +125,7 @@
if (lock_error_printing == 1)
return;
- W_("This words will i look for in debug: ");
+ W_("This words will i look for in debug: \n");
for (i = 0; i < MAX_VERBOSES; i++)
if (g.verbose_this[i])
W_(" * \"%s\"\n", g.verbose_this[i]);
Modified: initng/src/initng_main.c
==============================================================================
--- initng/src/initng_main.c (original)
+++ initng/src/initng_main.c Tue Dec 6 02:07:40 2005
@@ -85,27 +85,27 @@
switch (g.when_out)
{
case THEN_QUIT:
- P_(" ** Now Quiting **");
+ P_(" ** Now Quiting **\n");
exit_initng(0);
break;
case THEN_SULOGIN:
- P_(" ** Now SuLogin");
+ P_(" ** Now SuLogin\n");
su_login();
break;
case THEN_RESTART:
- P_(" ** Now restarting");
+ P_(" ** Now restarting\n");
restart_initng();
break;
case THEN_NEW_INIT:
- P_(" ** Launtching new init");
+ P_(" ** Launtching new init\n");
new_init();
break;
case THEN_REBOOT:
- P_(" ** Now rebooting");
+ P_(" ** Now rebooting\n");
exec_reboot();
break;
case THEN_HALT:
- P_(" ** Now halting");
+ P_(" ** Now halting\n");
exec_halt();
break;
}
@@ -202,7 +202,7 @@
}
if (!g.new_init || !g.new_init[0])
{
- F_(" g.new_init is not set!");
+ F_(" g.new_init is not set!\n");
return;
}
P_("\n\n\n Launching new init (%s)\n\n", g.new_init[0]);
Modified: initng/src/initng_plugin_hook.c
==============================================================================
--- initng/src/initng_plugin_hook.c (original)
+++ initng/src/initng_plugin_hook.c Tue Dec 6 02:07:40 2005
@@ -36,7 +36,7 @@
void initng_del_hook_real(const char *from_file, const char *func, int line,
e_ptype t, void *hook)
{
- D_("Deleting hook from file %s, func %s, line %i.", from_file, func,
+ D_("Deleting hook from file %s, func %s, line %i.\n", from_file, func,
line);
s_call *current, *safe = NULL;
Modified: initng/src/initng_service_cache.c
==============================================================================
--- initng/src/initng_service_cache.c (original)
+++ initng/src/initng_service_cache.c Tue Dec 6 02:07:40 2005
@@ -143,7 +143,7 @@
{
service_h *current = NULL;
- D_("(%s);", service);
+ D_("(%s);\n", service);
assert(service);
@@ -170,7 +170,7 @@
assert(service);
service_h *current = NULL;
- D_("(%s);", service);
+ D_("(%s);\n", service);
/* first give the exact find a shot */
if ((current = service_db_find_by_exact_name(service)))
@@ -210,7 +210,7 @@
assert(service);
- D_("(%s);", service);
+ D_("(%s);\n", service);
/* first search by name */
if ((current = service_db_find_by_name(service)))
Modified: initng/src/initng_struct_data.c
==============================================================================
--- initng/src/initng_struct_data.c (original)
+++ initng/src/initng_struct_data.c Tue Dec 6 02:07:40 2005
@@ -216,7 +216,7 @@
if (!IT(STRING))
{
- F_(" \"%s\" is not an STRING type, sleeping 1 sek ..",
+ F_(" \"%s\" is not an STRING type, sleeping 1 sek ..\n",
type->opt_name);
sleep(1);
return;
Modified: initng/tools/install_service.c
==============================================================================
--- initng/tools/install_service.c (original)
+++ initng/tools/install_service.c Tue Dec 6 02:07:40 2005
@@ -180,7 +180,7 @@
{
struct stat tmp;
- D_("Trying, with file \"%s\" : ", filename);
+ D_("Trying, with file \"%s\":\n", filename);
if (stat(filename, &tmp) == 0 && S_ISREG(tmp.st_mode))
{
if (executable)
@@ -967,7 +967,7 @@
if_block_processed = 0;
if (match_distro(line, distro))
{
- D_("actual distro %s matches line %s", distro, line);
+ D_("actual distro %s matches line %s\n", distro, line);
if_block_print_out = 1;
if_block_processed = 1;
}
More information about the Initng-svn
mailing list