From: kay.sievers@vrfy.org Date: Thu, 4 Mar 2004 08:57:29 +0000 (-0800) Subject: [PATCH] overall trivial trivial cleanup X-Git-Tag: 022~31 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d00bd1724bd9f75f5a7b8e0368428c2f0d6d3c26 [PATCH] overall trivial trivial cleanup Here I try to make the style a bit more consistant in the different files, so that new patches just copy the 'right' one :) Some "magic" numbers are replaced and udevtest.c is catched up with udev. --- diff --git a/logging.h b/logging.h index 1c27917f6..40c342c3a 100644 --- a/logging.h +++ b/logging.h @@ -34,6 +34,8 @@ #include #include +#define LOGNAME_SIZE 42 + #undef info #define info(format, arg...) \ do { \ @@ -61,12 +63,12 @@ extern void log_message(int level, const char *format, ...) __attribute__ ((format (printf, 2, 3))); /* each program that uses syslog must declare this variable somewhere */ -extern unsigned char logname[42]; +extern unsigned char logname[LOGNAME_SIZE]; #undef init_logging static inline void init_logging(char *program_name) { - snprintf(logname, 42,"%s[%d]", program_name, getpid()); + snprintf(logname, LOGNAME_SIZE,"%s[%d]", program_name, getpid()); openlog(logname, 0, LOG_DAEMON); } diff --git a/namedev_parse.c b/namedev_parse.c index 19acd96ef..defb698b2 100644 --- a/namedev_parse.c +++ b/namedev_parse.c @@ -58,7 +58,6 @@ static int add_config_dev(struct config_device *new_dev) void dump_config_dev(struct config_device *dev) { - /*FIXME dump all sysfs's */ dbg_parse("name='%s', symlink='%s', bus='%s', place='%s', id='%s', " "sysfs_file[0]='%s', sysfs_value[0]='%s', " "kernel='%s', program='%s', result='%s'", diff --git a/udev.c b/udev.c index 227145982..9b4d91f75 100644 --- a/udev.c +++ b/udev.c @@ -40,7 +40,7 @@ char **main_argv; char **main_envp; #ifdef LOG -unsigned char logname[42]; +unsigned char logname[LOGNAME_SIZE]; void log_message(int level, const char *format, ...) { va_list args; @@ -74,7 +74,7 @@ static char *subsystem_blacklist[] = { "usb_host", "pci_bus", "pcmcia_socket", - "", + "" }; static int udev_hotplug(void) @@ -164,7 +164,7 @@ exit: return -retval; } -int main(int argc, char **argv, char **envp) +int main(int argc, char *argv[], char *envp[]) { main_argv = argv; main_envp = envp; diff --git a/udevd.c b/udevd.c index 2b3dc5578..efcb65bb5 100644 --- a/udevd.c +++ b/udevd.c @@ -52,7 +52,7 @@ static void exec_queue_manager(void); static void msg_queue_manager(void); #ifdef LOG -unsigned char logname[42]; +unsigned char logname[LOGNAME_SIZE]; void log_message (int level, const char *format, ...) { va_list args; diff --git a/udevinfo.c b/udevinfo.c index b15f174e4..3361837a3 100644 --- a/udevinfo.c +++ b/udevinfo.c @@ -41,7 +41,7 @@ char **main_argv; int main_argc; #ifdef LOG -unsigned char logname[42]; +unsigned char logname[LOGNAME_SIZE]; void log_message (int level, const char *format, ...) { va_list args; diff --git a/udevsend.c b/udevsend.c index 4b6ef5c2f..11234808d 100644 --- a/udevsend.c +++ b/udevsend.c @@ -41,7 +41,7 @@ #include "logging.h" #ifdef LOG -unsigned char logname[42]; +unsigned char logname[LOGNAME_SIZE]; void log_message (int level, const char *format, ...) { va_list args; diff --git a/udevstart.c b/udevstart.c index 5c977b5ce..21fd93df7 100644 --- a/udevstart.c +++ b/udevstart.c @@ -34,7 +34,7 @@ #ifdef LOG -unsigned char logname[42]; +unsigned char logname[LOGNAME_SIZE]; void log_message(int level, const char *format, ...) { va_list args; @@ -187,7 +187,7 @@ static int udev_scan(void) } -int main(int argc, char **argv, char **envp) +int main(int argc, char *argv[], char *envp[]) { init_logging("udevstart"); diff --git a/udevtest.c b/udevtest.c index 4bc094fd9..e67d45257 100644 --- a/udevtest.c +++ b/udevtest.c @@ -38,15 +38,11 @@ char **main_argv; char **main_envp; #ifdef LOG -unsigned char logname[42]; +unsigned char logname[LOGNAME_SIZE]; void log_message (int level, const char *format, ...) { - va_list args; + va_list args; -// if (!udev_log) -// return; - - /* FIXME use level... */ va_start(args, format); vprintf(format, args); va_end(args); @@ -55,35 +51,24 @@ void log_message (int level, const char *format, ...) } #endif -static void sig_handler(int signum) -{ - switch (signum) { - case SIGINT: - case SIGTERM: - exit(20 + signum); - default: - dbg("unhandled signal"); - } -} - static char *subsystem_blacklist[] = { "net", "scsi_host", "scsi_device", "usb_host", "pci_bus", - "", + "pcmcia_socket", + "" }; -static int udev_hotplug(int argc, char **argv) +static int udev_hotplug(void) { char *devpath; char *subsystem; int retval = -EINVAL; int i; - struct sigaction act; - devpath = argv[1]; + devpath = main_argv[1]; if (!devpath) { dbg("no devpath?"); goto exit; @@ -98,7 +83,7 @@ static int udev_hotplug(int argc, char **argv) } /* skip blacklisted subsystems */ - subsystem = argv[1]; + subsystem = main_argv[1]; i = 0; while (subsystem_blacklist[i][0] != '\0') { if (strcmp(subsystem, subsystem_blacklist[i]) == 0) { @@ -111,16 +96,10 @@ static int udev_hotplug(int argc, char **argv) /* initialize our configuration */ udev_init_config(); - /* set up a default signal handler for now */ - act.sa_handler = sig_handler; - sigemptyset (&act.sa_mask); - act.sa_flags = SA_RESTART; - sigaction(SIGINT, &act, NULL); - sigaction(SIGTERM, &act, NULL); - /* initialize the naming deamon */ namedev_init(); + /* simulate node creation with fake flag */ retval = udev_add_device(devpath, subsystem, 1); exit: @@ -130,14 +109,14 @@ exit: return -retval; } -int main(int argc, char **argv, char **envp) +int main(int argc, char *argv[], char *envp[]) { main_argv = argv; main_envp = envp; dbg("version %s", UDEV_VERSION); - return udev_hotplug(argc, argv); + return udev_hotplug(); }