sensord: Coding style conversion (gnu ->
PATCH 6/7 sensord: Coding style conversion (gnu ->
Fix coding style in sensord.c
--- prog/sensord/sensord.c | 382 ++++++++++++++++++++++++------------------------- 1 file changed, 192 insertions(+), 190 deletions(-)
prog/sensord/sensord.c +192 -190
@@ -44,197 +44,199 @@#include <stdarg.h> -void -sensorLog -(int priority,const char *fmt, ...) { -static char buffer[1 +LOG_BUFFER ]; -va_list ap; -va_start (ap, fmt); -vsnprintf (buffer,LOG_BUFFER , fmt, ap); - buffer[LOG_BUFFER ] ='\0' ; -va_end (ap); -if (debug || (priority <LOG_DEBUG )) { -if (logOpened) { -syslog (priority,"%s" , buffer); - }else { -fprintf (stderr,"%s\n" , buffer); -fflush (stderr); - } - } -} - -static void -signalHandler -(int sig) { -signal (sig, signalHandler); -switch (sig) { -case SIGTERM : - done =1 ; -break ; -case SIGHUP : - reload =1 ; -break ; - } -} - -static int -sensord -(void ) { -int ret =0 ; -int scanValue =0 , logValue =0 ; -/* -* First RRD update at next RRD timeslot to prevent failures due -* one timeslot updated twice on restart for example. -*/ -int rrdValue = rrdTime -time (NULL ) % rrdTime; - -sensorLog (LOG_INFO ,"sensord started" ); - -while (!done) { -if (reload) { - ret =reloadLib (sensorsCfgFile); -if (ret) -sensorLog (LOG_NOTICE ,"config reload error (%d)" , ret); - reload =0 ; - } -if (scanTime && (scanValue <=0 )) { -if ((ret =scanChips ())) -sensorLog (LOG_NOTICE ,"sensor scan error (%d)" , ret); - scanValue += scanTime; - } -if (logTime && (logValue <=0 )) { -if ((ret =readChips ())) -sensorLog (LOG_NOTICE ,"sensor read error (%d)" , ret); - logValue += logTime; - } -if (rrdTime && rrdFile && (rrdValue <=0 )) { -if ((ret =rrdUpdate ())) -sensorLog (LOG_NOTICE ,"rrd update error (%d)" , ret); -/* -* The amount of time to wait is computed using the same method as -* in RRD instead of simply adding the interval. -*/ - rrdValue = rrdTime -time (NULL ) % rrdTime; - } -if (!done) { -int a = logTime ? logValue :INT_MAX ; -int b = scanTime ? scanValue :INT_MAX ; -int c = (rrdTime && rrdFile) ? rrdValue :INT_MAX ; -int sleepTime = (a < b) ? ((a < c) ? a : c) : ((b < c) ? b : c); -sleep (sleepTime); - scanValue -= sleepTime; - logValue -= sleepTime; - rrdValue -= sleepTime; - } - } - -sensorLog (LOG_INFO ,"sensord stopped" ); - -return ret; -} - -static void -openLog -(void ) { -openlog ("sensord" ,0 , syslogFacility); - logOpened =1 ; -} - -static void -daemonize -(void ) { -int pid; -struct stat fileStat; -FILE *file; - -if (chdir ("/" ) <0 ) { -perror ("chdir()" ); -exit (EXIT_FAILURE ); - } - -if (!(stat (pidFile, &fileStat)) && - ((!S_ISREG (fileStat.st_mode)) || (fileStat.st_size >11 ))) { -fprintf (stderr,"Error: PID file `%s' already exists and looks suspicious.\n" , pidFile); -exit (EXIT_FAILURE ); - } +void sensorLog (int priority,const char *fmt, ...) +{ +static char buffer[1 +LOG_BUFFER ]; +va_list ap; +va_start (ap, fmt); +vsnprintf (buffer,LOG_BUFFER , fmt, ap); + buffer[LOG_BUFFER ] ='\0' ; +va_end (ap); +if (debug || (priority <LOG_DEBUG )) { +if (logOpened) { +syslog (priority,"%s" , buffer); + }else { +fprintf (stderr,"%s\n" , buffer); +fflush (stderr); + } + } +} + +static void signalHandler (int sig) +{ +signal (sig, signalHandler); +switch (sig) { +case SIGTERM : + done =1 ; +break ; +case SIGHUP : + reload =1 ; +break ; + } +} + +static int sensord (void ) +{ +int ret =0 ; +int scanValue =0 , logValue =0 ; +/* +* First RRD update at next RRD timeslot to prevent failures due +* one timeslot updated twice on restart for example. +*/ +int rrdValue = rrdTime -time (NULL ) % rrdTime; + +sensorLog (LOG_INFO ,"sensord started" ); + +while (!done) { +if (reload) { + ret =reloadLib (sensorsCfgFile); +if (ret) +sensorLog (LOG_NOTICE , +"config reload error (%d)" , ret); + reload =0 ; + } +if (scanTime && (scanValue <=0 )) { +if ((ret =scanChips ())) +sensorLog (LOG_NOTICE , +"sensor scan error (%d)" , ret); + scanValue += scanTime; + } +if (logTime && (logValue <=0 )) { +if ((ret =readChips ())) +sensorLog (LOG_NOTICE , +"sensor read error (%d)" , ret); + logValue += logTime; + } +if (rrdTime && rrdFile && (rrdValue <=0 )) { +if ((ret =rrdUpdate ())) +sensorLog (LOG_NOTICE , +"rrd update error (%d)" , ret); +/* +* The amount of time to wait is computed using the +* same method as in RRD instead of simply adding the +* interval. +*/ + rrdValue = rrdTime -time (NULL ) % rrdTime; + } +if (!done) { +int a = logTime ? logValue :INT_MAX ; +int b = scanTime ? scanValue :INT_MAX ; +int c = (rrdTime && rrdFile) ? rrdValue :INT_MAX ; +int sleepTime = (a < b) ? ((a < c) ? a : c) : + ((b < c) ? b : c); +sleep (sleepTime); + scanValue -= sleepTime; + logValue -= sleepTime; + rrdValue -= sleepTime; + } + } + +sensorLog (LOG_INFO ,"sensord stopped" ); + +return ret; +} + +static void openLog (void ) +{ +openlog ("sensord" ,0 , syslogFacility); + logOpened =1 ; +} + +static void daemonize (void ) +{ +int pid; +struct stat fileStat; +FILE *file; + +if (chdir ("/" ) <0 ) { +perror ("chdir()" ); +exit (EXIT_FAILURE ); + } + +if (!(stat (pidFile, &fileStat)) && + ((!S_ISREG (fileStat.st_mode)) || (fileStat.st_size >11 ))) { +fprintf (stderr, +"Error: PID file `%s' already exists and looks suspicious.\n" , + pidFile); +exit (EXIT_FAILURE ); + } -if (!(file =fopen (pidFile,"w" ))) { -fprintf (stderr,"fopen(\"%s\"): %s\n" , pidFile,strerror (errno)); -exit (EXIT_FAILURE ); - } +if (!(file =fopen (pidFile,"w" ))) { +fprintf (stderr,"fopen(\"%s\"): %s\n" , pidFile, +strerror (errno)); +exit (EXIT_FAILURE ); + } + +/* I should use sigaction but... */ +if (signal (SIGTERM , signalHandler) =SIG_ERR || +signal (SIGHUP , signalHandler) =SIG_ERR ) { +perror ("signal" ); +exit (EXIT_FAILURE ); + } + +if ((pid =fork ()) =-1 ) { +perror ("fork()" ); +exit (EXIT_FAILURE ); + }else if (pid !=0 ) { +fprintf (file,"%d\n" , pid); +fclose (file); +unloadLib (); +exit (EXIT_SUCCESS ); + } + +if (setsid () <0 ) { +perror ("setsid()" ); +exit (EXIT_FAILURE ); + } + +fclose (file); +close (STDIN_FILENO ); +close (STDOUT_FILENO ); +close (STDERR_FILENO ); +} + +static void undaemonize (void ) +{ +unlink (pidFile); +closelog (); +} + +int main (int argc,char **argv) +{ +int ret =0 ; + +if (parseArgs (argc, argv) || +parseChips (argc, argv)) +exit (EXIT_FAILURE ); + +if (loadLib (sensorsCfgFile)) +exit (EXIT_FAILURE ); + +if (isDaemon) +openLog (); +if (rrdFile) + ret =rrdInit (); + +if (ret) { + }else if (doCGI) { + ret =rrdCGI (); + }else if (isDaemon) { +daemonize (); + ret =sensord (); +undaemonize (); + }else { +if (doSet) + ret =setChips (); +else if (doScan) + ret =scanChips (); +else if (rrdFile) + ret =rrdUpdate (); +else + ret =readChips (); + } -/* I should use sigaction but... */ -if (signal (SIGTERM , signalHandler) =SIG_ERR || -signal (SIGHUP , signalHandler) =SIG_ERR ) { -perror ("signal" ); -exit (EXIT_FAILURE ); - } - -if ((pid =fork ()) =-1 ) { -perror ("fork()" ); -exit (EXIT_FAILURE ); - }else if (pid !=0 ) { -fprintf (file,"%d\n" , pid); -fclose (file); -unloadLib (); -exit (EXIT_SUCCESS ); - } - -if (setsid () <0 ) { -perror ("setsid()" ); -exit (EXIT_FAILURE ); - } - -fclose (file); -close (STDIN_FILENO ); -close (STDOUT_FILENO ); -close (STDERR_FILENO ); -} - -static void -undaemonize -(void ) { -unlink (pidFile); -closelog (); -} - -int -main -(int argc,char **argv) { -int ret =0 ; +if (unloadLib ()) +exit (EXIT_FAILURE ); -if (parseArgs (argc, argv) || -parseChips (argc, argv)) -exit (EXIT_FAILURE ); - -if (loadLib (sensorsCfgFile)) -exit (EXIT_FAILURE ); - -if (isDaemon) -openLog (); -if (rrdFile) - ret =rrdInit (); - -if (ret) { - }else if (doCGI) { - ret =rrdCGI (); - }else if (isDaemon) { -daemonize (); - ret =sensord (); -undaemonize (); - }else { -if (doSet) - ret =setChips (); -else if (doScan) - ret =scanChips (); -else if (rrdFile) - ret =rrdUpdate (); -else - ret =readChips (); - } - -if (unloadLib ()) -exit (EXIT_FAILURE ); - -return ret; +return ret; }
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Re: [lm-sensors] [PATCH 6/7] sensord: Coding style conversion (gnu
Quoted 11 lines · Andre Prendel
Fix coding style in
sensord.c
(...)prog/sensord/sensord.c +8
-0+static void daemonize (void ) +{ +int pid; +struct stat fileStat; +FILE *file; + +if (chdir ("/" ) <0 ) { +perror ("chdir()" );
prog/sensord/sensord.c line 162
Quoted 10 lines
prog/sensord/sensord.c +10
-0+exit (EXIT_FAILURE ); + } + +if (!(stat (pidFile, &fileStat)) && + ((!S_ISREG (fileStat.st_mode)) || (fileStat.st_size >11 ))) { +fprintf (stderr, +"Error: PID file `%s' already exists and looks suspicious.\n" , + pidFile); +exit (EXIT_FAILURE ); + }
Trailing white space, could be stripped (and a few other occurrences in this file.)
Quoted 4 lines
prog/sensord/sensord.c +0
-4-if (!(file =fopen (pidFile,"w" ))) { -fprintf (stderr,"fopen(\"%s\"): %s\n" , pidFile,strerror (errno)); -exit (EXIT_FAILURE ); - }
Signature · 6 lines
Jean Delvare _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Re: [lm-sensors] [PATCH 6/7] sensord: Coding style conversion (gnu
In reply to Andre PrendelQuoted 17 lines · Jean Delvare
Quoted 16 lines · Andre Prendel
Fix coding style in
sensord.c
(...)prog/sensord/sensord.c +14
-0+static void daemonize (void ) +{ +int pid; +struct stat fileStat; +FILE *file; + +if (chdir ("/" ) <0 ) { +perror ("chdir()" ); +exit (EXIT_FAILURE ); + } + +if (!(stat (pidFile, &fileStat)) && + ((!S_ISREG (fileStat.st_mode)) || (fileStat.st_size >11 ))) { + fprintf(stderr,
Quoted 8 lines
prog/sensord/sensord.c line 162
Quoted 5 lines
prog/sensord/sensord.c +4
-0+"Error: PID file `%s' already exists and looks suspicious.\n" , + pidFile); +exit (EXIT_FAILURE ); + }Trailing white space, could be stripped (and a few other occurrences in this file.)
You're right. Strange, quilt complains about that whitespaces in all the other patches except that one. I switched on support in emacs to find the occurrences and fixed it.
Quoted 8 lines
Quoted 5 lines
prog/sensord/sensord.c +0
-4-if (!(file =fopen (pidFile,"w" ))) { -fprintf (stderr,"fopen(\"%s\"): %s\n" , pidFile,strerror (errno)); -exit (EXIT_FAILURE ); - }Signature · 1 line
Jean Delvare
Thanks
Andre
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors