emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nslookup: smaller qtypes[] array

Browse Source 
function                                             old     new   delta
nslookup_main                                       2708    2715      +7
qtypes                                                80      72      -8
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 7/-8)               Total: -1 bytes
   text	   data	    bss	    dec	    hex	filename
 926277	    555	   5740	 932572	  e3adc	busybox_old
 926262	    555	   5740	 932557	  e3acd	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-04-15 10:52:11 +02:00
parent 2cf75b3c81
commit a980109c6a
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
networking/nslookup.c
View File

@ -271,8 +271,8 @@ struct query {
}; };
static const struct { static const struct {
int type; unsigned char type;
const char *name; char name[7];
} qtypes[] = { } qtypes[] = {
{ ns_t_soa, "SOA" }, { ns_t_soa, "SOA" },
{ ns_t_ns, "NS" }, { ns_t_ns, "NS" },
@ -285,7 +285,6 @@ static const struct {
{ ns_t_txt, "TXT" }, { ns_t_txt, "TXT" },
{ ns_t_ptr, "PTR" }, { ns_t_ptr, "PTR" },
{ ns_t_any, "ANY" }, { ns_t_any, "ANY" },
{ }
}; };
static const char *const rcodes[] = { static const char *const rcodes[] = {
@ -803,7 +802,7 @@ int nslookup_main(int argc UNUSED_PARAM, char **argv)
ptr = chr + 1; ptr = chr + 1;
for (c = 0;; c++) { for (c = 0;; c++) {
if (!qtypes[c].name) if (c == ARRAY_SIZE(qtypes))
bb_error_msg_and_die("invalid query type \"%s\"", ptr); bb_error_msg_and_die("invalid query type \"%s\"", ptr);
if (strcmp(qtypes[c].name, ptr) == 0) if (strcmp(qtypes[c].name, ptr) == 0)
break; break;
@ -836,13 +835,11 @@ int nslookup_main(int argc UNUSED_PARAM, char **argv)
add_query(&queries, &n_queries, T_AAAA, *argv); add_query(&queries, &n_queries, T_AAAA, *argv);
#endif #endif
} }
} } else {
else {
int c; int c;
for (c = 0; qtypes[c].name; c++) { for (c = 0; c < ARRAY_SIZE(qtypes); c++) {
if (types & (1 << c)) if (types & (1 << c))
add_query(&queries, &n_queries, qtypes[c].type, add_query(&queries, &n_queries, qtypes[c].type, *argv);
*argv);
} }
} }
argv++; argv++;