Changeset 2109

Timestamp:

11/07/11 22:04:10 (19 months ago)

Author:

kaiwang27

Message:

Style changes to nm(1):
* Removed a few empty lines.
* Removed a few unneeded assertions.
* Removed a inner declaration.
* Insert a missing break.
* Do not use sysexits(3) error codes, since that is no longer encouraged by style(9).
* Update the nm(1) test suite to catch up with the exit code changes.

Location:

trunk

Files:

• nm/nm.c (modified) (19 diffs)
• test/nm/ts/nm_option/tc.sh (modified) (1 diff)

trunk/nm/nm.c

@@ -320 +320 @@
 
         return (strcmp(((const struct sym_entry *)l)->name,
-                ((const struct sym_entry *)r)->name));
+            ((const struct sym_entry *)r)->name));
 }
 
@@ -441 +441 @@
                 return (ELFTC_DEM_ARM);
         else
-                errx(EX_USAGE, "unknown demangling style '%s'", opt);
+                errx(1, "unknown demangling style '%s'", opt);
 
         /* NOTREACHED */
@@ -487 +487 @@
                         default:
                                 warnx("%s: Invalid format", optarg);
-                                usage(EX_USAGE);
+                                usage(1);
                         }
 
@@ -540 +540 @@
                         default:
                                 warnx("%s: Invalid radix", optarg);
-                                usage(EX_USAGE);
+                                usage(1);
                         }
                         break;
@@ -569 +569 @@
                         break;
                 case 'h':
-                        usage(EX_OK);
+                        usage(0);
                 default :
-                        usage(EX_USAGE);
+                        usage(1);
                 }
         }
@@ -585 +585 @@
         if (nm_opts.undef_only == true) {
                 if (nm_opts.sort_fn == &cmp_size)
-                        errx(EX_USAGE, "--size-sort with -u is meaningless");
-
+                        errx(1, "--size-sort with -u is meaningless");
                 if (nm_opts.def_only != 0)
-                        errx(EX_USAGE,
-                            "-u with --defined-only is meaningless");
+                        errx(1, "-u with --defined-only is meaningless");
         }
         if (nm_opts.print_debug == false)
@@ -616 +614 @@
         char type;
         bool filter;
-        int i;
+        int i, j;
 
         assert(elf != NULL);
@@ -639 +637 @@
                 data = NULL;
                 while ((data = elf_getdata(scn, data)) != NULL) {
-                        int j = 1;
+                        j = 1;
                         while (gelf_getsym(data, j++, &sym) != NULL) {
 
@@ -735 +733 @@
         nm_info.name = ELFTC_GETPROGNAME();
         nm_info.def_filename = "a.out";
-
         nm_opts.print_symbol = PRINT_SYM_SYM;
         nm_opts.print_name = PRINT_NAME_NONE;
@@ -742 +739 @@
         nm_opts.print_armap = false;
         nm_opts.print_size = 0;
-
         nm_opts.debug_line = false;
-
         nm_opts.def_only = 0;
         nm_opts.undef_only = false;
-
         nm_opts.sort_size = 0;
         nm_opts.sort_reverse = false;
         nm_opts.no_demangle = 0;
-
         nm_opts.sort_fn = &cmp_name;
         nm_opts.elem_print_fn = &sym_elem_print_all;
         nm_opts.value_print_fn = &sym_value_dec_print;
         nm_opts.size_print_fn = &sym_size_dec_print;
-
         SLIST_INIT(&nm_out_filter);
 }
@@ -908 +900 @@
 print_version(void)
 {
+
         (void) printf("%s (%s)\n", nm_info.name, elftc_version());
-        exit(EX_OK);
+        exit(0);
 }
 
@@ -1870 +1863 @@
                 sec = "*LOPROC*";
                 break;
-
         case SHN_HIPROC:
                 sec = "*HIPROC*";
                 break;
-
         case SHN_LOOS:
                 sec = "*LOOS*";
                 break;
-
         case SHN_HIOS:
                 sec = "*HIOS*";
                 break;
-
         case SHN_ABS:
                 sec = "*ABS*";
                 break;
-
         case SHN_COMMON:
                 sec = "*COM*";
                 break;
-
         case SHN_HIRESERVE:
                 /* HIRESERVE or XINDEX */
                 sec = "*HIRESERVE*";
                 break;
-
         default:
                 if (ep->sym->st_shndx > p->sh_num)
                         return;
                 sec = p->s_table[ep->sym->st_shndx];
+                break;
         };
 
@@ -1948 +1935 @@
 
         assert(sym != NULL && "sym is null");
-
         printf("%016" PRIo64, sym->st_size);
 }
@@ -1957 +1943 @@
 
         assert(sym != NULL && "sym is null");
-
         if (nm_elfclass == ELFCLASS32)
                 printf("%08" PRIx64, sym->st_size);
@@ -1969 +1954 @@
 
         assert(sym != NULL && "sym is null");
-
         printf("%016" PRId64, sym->st_size);
 }
@@ -1978 +1962 @@
 
         assert(sym != NULL && "sym is null");
-
         printf("%016" PRIo64, sym->st_value);
 }
@@ -1987 +1970 @@
 
         assert(sym != NULL && "sym is null");
-
         if (nm_elfclass == ELFCLASS32)
                 printf("%08" PRIx64, sym->st_value);
@@ -1999 +1981 @@
 
         assert(sym != NULL && "sym is null");
-
         printf("%016" PRId64, sym->st_value);
 }
@@ -2067 +2048 @@
 main(int argc, char **argv)
 {
-        int rtn = 1;
-
-        assert(argc > 0);
+        int rtn;
 
         global_init();
-
-        assert(nm_info.name != NULL && "nm_info.name is null");
-        assert(nm_info.def_filename != NULL && "nm_info.def_filename is null");
-
         get_opt(argc, argv);
-
-        assert(nm_opts.sort_fn != NULL && "nm_opts.sort_fn is null");
-        assert(nm_opts.elem_print_fn != NULL &&
-            "nm_opts.elem_print_fn is null");
-        assert(nm_opts.value_print_fn != NULL &&
-            "nm_opts.value_print_fn is null");
-
         rtn = read_files(argc - optind, argv + optind);
-
         global_dest();
 
-        return (rtn);
-}
+        exit(rtn);
+}

trunk/test/nm/ts/nm_option/tc.sh

@@ -39 +39 @@
 
 ERROR_OK="0"
-ERROR_USAGE="64"
+ERROR_USAGE="1"
 
 tet_startup=""