aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCristian Ionescu-Idbohrn <cii@axis.com>2011-05-20 03:52:36 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2011-05-20 03:52:36 +0200
commitea137aa931f1b109a966ff685d9b79b39f7180b4 (patch)
tree498c87ef947edd5c435c8ad56fc18ad2387a4dec
parent9e933d9bfc7f52a7d8bc61805f70e3039b30216f (diff)
downloadbusybox-w32-ea137aa931f1b109a966ff685d9b79b39f7180b4.tar.gz
busybox-w32-ea137aa931f1b109a966ff685d9b79b39f7180b4.tar.bz2
busybox-w32-ea137aa931f1b109a966ff685d9b79b39f7180b4.zip
warning removal
Signed-off-by: Cristian Ionescu-Idbohrn <cii@axis.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-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)
702 702
703static void set_status(const unsigned status_node_num, const char *new_value, const int position) 703static void set_status(const unsigned status_node_num, const char *new_value, const int position)
704{ 704{
705 const unsigned new_value_len = strlen(new_value);
706 const unsigned new_value_num = search_name_hashtable(new_value); 705 const unsigned new_value_num = search_name_hashtable(new_value);
707 unsigned want = get_status(status_node_num, 1); 706 unsigned want = get_status(status_node_num, 1);
708 unsigned flag = get_status(status_node_num, 2); 707 unsigned flag = get_status(status_node_num, 2);
709 unsigned status = get_status(status_node_num, 3); 708 unsigned status = get_status(status_node_num, 3);
710 int want_len = strlen(name_hashtable[want]);
711 int flag_len = strlen(name_hashtable[flag]);
712 int status_len = strlen(name_hashtable[status]);
713 char *new_status; 709 char *new_status;
714 710
715 switch (position) { 711 switch (position) {
716 case 1: 712 case 1:
717 want = new_value_num; 713 want = new_value_num;
718 want_len = new_value_len;
719 break; 714 break;
720 case 2: 715 case 2:
721 flag = new_value_num; 716 flag = new_value_num;
722 flag_len = new_value_len;
723 break; 717 break;
724 case 3: 718 case 3:
725 status = new_value_num; 719 status = new_value_num;
726 status_len = new_value_len;
727 break; 720 break;
728 default: 721 default:
729 bb_error_msg_and_die("DEBUG ONLY: this shouldnt happen"); 722 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)
563 xsetgid(rgid); /* drop all privileges */ 563 xsetgid(rgid); /* drop all privileges */
564 xsetuid(ruid); 564 xsetuid(ruid);
565 } 565 }
566 ret: ;
567# if ENABLE_FEATURE_SUID_CONFIG 566# if ENABLE_FEATURE_SUID_CONFIG
567 ret: ;
568 llist_free((llist_t*)suid_config, NULL); 568 llist_free((llist_t*)suid_config, NULL);
569# endif 569# endif
570} 570}