misc: remove superfluous null pointer checks for optarg

This is only needed for optional arguments.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index 3bea971cdc513fd5b3ca860eb24333d31ee754fd..10b0bdcda02438612e26c764b4cc60c9274a5a13 100644 (file)
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -235,8 +235,6 @@ static void parse_argv(int argc, char **argv, struct sinfo *pinfo)
                        print_shells();
                        exit(EXIT_SUCCESS);
                case 's':
-                       if (!optarg)
-                               usage(stderr);
                        pinfo->shell = optarg;
                        break;
                default:

diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c
index ab04c10bb2214f738feed77219ce4ae6deec4e70..1e89d27037091bc76a6c7f0969e7601317977d77 100644 (file)
--- a/login-utils/lslogins.c
+++ b/login-utils/lslogins.c
@@ -1381,15 +1381,12 @@ int main(int argc, char *argv[])
                        outmode = OUT_NEWLINE;
                        break;
                case 'o':
-                       if (optarg) {
-                               if (*optarg == '=')
-                                       optarg++;
-                               ncolumns = string_to_idarray(optarg,
-                                               columns, ARRAY_SIZE(columns),
-                                               column_name_to_id);
-                               if (ncolumns < 0)
-                                       return EXIT_FAILURE;
-                       }
+                       if (*optarg == '=')
+                               optarg++;
+                       ncolumns = string_to_idarray(optarg, columns,
+                                       ARRAY_SIZE(columns), column_name_to_id);
+                       if (ncolumns < 0)
+                               return EXIT_FAILURE;
                        opt_o = 1;
                        break;
                case 'r':

diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c
index 125734dfee23548f6a23b5e32b8467a12fb0af2d..bf0631654141e0ce7767c30a56fde5de416f289a 100644 (file)
--- a/text-utils/hexdump.c
+++ b/text-utils/hexdump.c
@@ -107,7 +107,7 @@ parse_args(int argc, char **argv, struct hexdump *hex)
                case 'f':
                        addfile(optarg, hex);
                        break;
-                case 'L':
+               case 'L':
                        colormode = UL_COLORMODE_AUTO;
                        if (optarg)
                                colormode = colormode_or_err(optarg,