diff options
author | Günther Deschner <gd@samba.org> | 2011-05-31 13:24:09 +0200 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2011-06-01 00:29:30 +0200 |
commit | f103e0c39f9f93b765a9cdb93a7600a1f6f06315 (patch) | |
tree | 8038484244be70fe325bcdce9b6ed0cfc4240a1a | |
parent | b9a727c5f17c96138698a06e8c894387531e82b2 (diff) | |
download | samba-f103e0c39f9f93b765a9cdb93a7600a1f6f06315.tar.gz samba-f103e0c39f9f93b765a9cdb93a7600a1f6f06315.tar.bz2 samba-f103e0c39f9f93b765a9cdb93a7600a1f6f06315.zip |
s3: fix more -Wunused-but-set-variable build warnings.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Jun 1 00:29:30 CEST 2011 on sn-devel-104
-rw-r--r-- | source3/lib/util_str.c | 3 | ||||
-rw-r--r-- | source3/printing/tests/vlp.c | 3 | ||||
-rw-r--r-- | source3/rpc_server/spoolss/srv_spoolss_nt.c | 3 | ||||
-rw-r--r-- | source3/utils/net_rpc.c | 3 |
4 files changed, 2 insertions, 10 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index 2a853c3d1a..f039a3a522 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -868,7 +868,6 @@ uint64_t STR_TO_SMB_BIG_UINT(const char *nptr, const char **entptr) */ uint64_t conv_str_size(const char * str) { - uint64_t lval_orig; uint64_t lval; char * end; @@ -886,8 +885,6 @@ uint64_t conv_str_size(const char * str) return lval; } - lval_orig = lval; - if (strwicmp(end, "K") == 0) { lval *= 1024ULL; } else if (strwicmp(end, "M") == 0) { diff --git a/source3/printing/tests/vlp.c b/source3/printing/tests/vlp.c index b22050632e..927224cb2e 100644 --- a/source3/printing/tests/vlp.c +++ b/source3/printing/tests/vlp.c @@ -111,10 +111,9 @@ static int next_jobnum(char *printer) static void set_printer_status(char *printer, int status) { fstring keystr; - int result; slprintf(keystr, sizeof(keystr) - 1, "STATUS/%s", printer); - result = tdb_store_int32(tdb, keystr, status); + tdb_store_int32(tdb, keystr, status); } static int get_printer_status(char *printer) diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c index f7fa189af5..52e4ab0a72 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -4179,10 +4179,9 @@ static WERROR construct_printer_info6(TALLOC_CTX *mem_ctx, struct spoolss_PrinterInfo6 *r, int snum) { - int count; print_status_struct status; - count = print_queue_length(msg_ctx, snum, &status); + print_queue_length(msg_ctx, snum, &status); r->status = nt_printq_status(status.status); diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index a3ce5316d7..849eec3a67 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -6501,7 +6501,6 @@ static int rpc_trustdom_vampire(struct net_context *c, int argc, struct rpc_pipe_client *pipe_hnd = NULL; NTSTATUS nt_status, result; const char *domain_name = NULL; - struct dom_sid *queried_dom_sid; struct policy_handle connect_hnd; union lsa_PolicyInformation *info = NULL; @@ -6594,8 +6593,6 @@ static int rpc_trustdom_vampire(struct net_context *c, int argc, return -1; } - queried_dom_sid = info->account_domain.sid; - /* * Keep calling LsaEnumTrustdom over opened pipe until * the end of enumeration is reached |