summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--archival/dpkg.c7
-rw-r--r--libbb/appletlib.c2
2 files changed, 1 insertions, 8 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c
index f8e349d09..8899d1719 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -702,28 +702,21 @@ static unsigned get_status(const unsigned status_node, const int num)
static void set_status(const unsigned status_node_num, const char *new_value, const int position)
{
- const unsigned new_value_len = strlen(new_value);
const unsigned new_value_num = search_name_hashtable(new_value);
unsigned want = get_status(status_node_num, 1);
unsigned flag = get_status(status_node_num, 2);
unsigned status = get_status(status_node_num, 3);
- int want_len = strlen(name_hashtable[want]);
- int flag_len = strlen(name_hashtable[flag]);
- int status_len = strlen(name_hashtable[status]);
char *new_status;
switch (position) {
case 1:
want = new_value_num;
- want_len = new_value_len;
break;
case 2:
flag = new_value_num;
- flag_len = new_value_len;
break;
case 3:
status = new_value_num;
- status_len = new_value_len;
break;
default:
bb_error_msg_and_die("DEBUG ONLY: this shouldnt happen");
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 30224ed94..0dac0ba14 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -563,8 +563,8 @@ static void check_suid(int applet_no)
xsetgid(rgid); /* drop all privileges */
xsetuid(ruid);
}
- ret: ;
# if ENABLE_FEATURE_SUID_CONFIG
+ ret: ;
llist_free((llist_t*)suid_config, NULL);
# endif
}