Checking first char for null is more efficient than strlen.
This commit is contained in:
parent
847ccac13c
commit
07728abbc1
@ -151,7 +151,7 @@ rc_depinfo_t *rc_deptree_load (void)
|
||||
{
|
||||
/* Sanity */
|
||||
e = get_shell_value (p);
|
||||
if (! e || strlen (e) == 0)
|
||||
if (! e || *e == '\0')
|
||||
goto next;
|
||||
|
||||
if (! deptree)
|
||||
@ -176,7 +176,7 @@ rc_depinfo_t *rc_deptree_load (void)
|
||||
|
||||
/* Sanity */
|
||||
e = get_shell_value (p);
|
||||
if (! e || strlen (e) == 0)
|
||||
if (! e || *e == '\0')
|
||||
goto next;
|
||||
|
||||
if (! deptype)
|
||||
|
@ -196,7 +196,7 @@ char **rc_config_load (const char *file)
|
||||
do {
|
||||
/* Bash variables are usually quoted */
|
||||
token = strsep (&line, "\"\'");
|
||||
} while ((token) && (strlen (token) == 0));
|
||||
} while (token && *token == '\0');
|
||||
|
||||
/* Drop a newline if that's all we have */
|
||||
if (token) {
|
||||
|
@ -205,7 +205,7 @@ static int do_service (int argc, char **argv)
|
||||
else
|
||||
service = getenv ("SVCNAME");
|
||||
|
||||
if (! service || strlen (service) == 0)
|
||||
if (! service || *service == '\0')
|
||||
eerrorx ("%s: no service specified", applet);
|
||||
|
||||
if (strcmp (applet, "service_started") == 0)
|
||||
@ -252,7 +252,7 @@ static int do_mark_service (int argc, char **argv)
|
||||
else
|
||||
service = getenv ("SVCNAME");
|
||||
|
||||
if (! service || strlen (service) == 0)
|
||||
if (! service || *service == '\0')
|
||||
eerrorx ("%s: no service specified", applet);
|
||||
|
||||
if (strcmp (applet, "mark_service_started") == 0)
|
||||
@ -310,7 +310,7 @@ static int do_value (int argc, char **argv)
|
||||
if (! service)
|
||||
eerrorx ("%s: no service specified", applet);
|
||||
|
||||
if (argc < 2 || ! argv[1] || strlen (argv[1]) == 0)
|
||||
if (argc < 2 || ! argv[1] || *argv[1] == '\0')
|
||||
eerrorx ("%s: no option specified", applet);
|
||||
|
||||
if (strcmp (applet, "service_get_value") == 0 ||
|
||||
|
@ -634,7 +634,7 @@ int main (int argc, char **argv)
|
||||
{
|
||||
switch (opt) {
|
||||
case 'o':
|
||||
if (strlen (optarg) == 0)
|
||||
if (*optarg == '\0')
|
||||
optarg = NULL;
|
||||
exit (set_ksoftlevel (optarg) ? EXIT_SUCCESS : EXIT_FAILURE);
|
||||
case_RC_COMMON_GETOPT
|
||||
|
@ -152,7 +152,7 @@ static int parse_signal (const char *sig)
|
||||
unsigned int i = 0;
|
||||
char *s;
|
||||
|
||||
if (! sig || strlen (sig) == 0)
|
||||
if (! sig || *sig == '\0')
|
||||
return (-1);
|
||||
|
||||
if (sscanf (sig, "%u", &i) == 1) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user