svn commit: samba r16743 - in trunk/source: libndr passdb torture utils

[vlendec at samba.org]

Author: vlendec
Date: 2006-07-01 15:21:17 +0000 (Sat, 01 Jul 2006)
New Revision: 16743

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16743

Log:
Fix some warnings
Modified:
   trunk/source/libndr/ndr_basic.c
   trunk/source/passdb/pdb_interface.c
   trunk/source/torture/locktest2.c
   trunk/source/torture/scanner.c
   trunk/source/utils/debug2html.c


Changeset:
Modified: trunk/source/libndr/ndr_basic.c
===================================================================
--- trunk/source/libndr/ndr_basic.c	2006-07-01 15:12:10 UTC (rev 16742)
+++ trunk/source/libndr/ndr_basic.c	2006-07-01 15:21:17 UTC (rev 16743)
@@ -764,7 +764,7 @@
 {
 	ndr->print(ndr, "%-25s: DATA_BLOB length=%u", name, r.length);
 	if (r.length) {
-		dump_data(10, r.data, r.length);
+		dump_data(10, (const char *)r.data, r.length);
 	}
 }
 

Modified: trunk/source/passdb/pdb_interface.c
===================================================================
--- trunk/source/passdb/pdb_interface.c	2006-07-01 15:12:10 UTC (rev 16742)
+++ trunk/source/passdb/pdb_interface.c	2006-07-01 15:21:17 UTC (rev 16743)
@@ -1720,7 +1720,7 @@
 static BOOL next_entry_users(struct pdb_search *s,
 			     struct samr_displayentry *entry)
 {
-	struct user_search *state = s->private_data;
+	struct user_search *state = (struct user_search *)s->private_data;
 	struct samu *user = NULL;
 
  next:
@@ -1795,7 +1795,7 @@
 static BOOL next_entry_groups(struct pdb_search *s,
 			      struct samr_displayentry *entry)
 {
-	struct group_search *state = s->private_data;
+	struct group_search *state = (struct group_search *)s->private_data;
 	uint32 rid;
 	GROUP_MAP *map = &state->groups[state->current_group];
 
@@ -1813,7 +1813,8 @@
 
 static void search_end_groups(struct pdb_search *search)
 {
-	struct group_search *state = search->private_data;
+	struct group_search *state =
+		(struct group_search *)search->private_data;
 	SAFE_FREE(state->groups);
 }
 

Modified: trunk/source/torture/locktest2.c
===================================================================
--- trunk/source/torture/locktest2.c	2006-07-01 15:12:10 UTC (rev 16742)
+++ trunk/source/torture/locktest2.c	2006-07-01 15:21:17 UTC (rev 16743)
@@ -135,6 +135,7 @@
 
 static void print_brl(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, 
 		      enum brl_type lock_type,
+		      enum brl_flavour lock_flav,
 		      br_off start, br_off size)
 {
 	printf("%6d   %05x:%05x    %s  %.0f:%.0f(%.0f)\n", 

Modified: trunk/source/torture/scanner.c
===================================================================
--- trunk/source/torture/scanner.c	2006-07-01 15:12:10 UTC (rev 16742)
+++ trunk/source/torture/scanner.c	2006-07-01 15:21:17 UTC (rev 16743)
@@ -49,7 +49,7 @@
 			 int op,
 			 char *param, char *data,
 			 int param_len, int data_len,
-			 int *rparam_len, int *rdata_len)
+			 unsigned int *rparam_len, unsigned int *rdata_len)
 {
 	uint16 setup = op;
 	char *rparam=NULL, *rdata=NULL;
@@ -80,7 +80,7 @@
 			     int op, int level,
 			     char *param, char *data,
 			     int param_len, int *data_len,
-			     int *rparam_len, int *rdata_len)
+			     unsigned int *rparam_len, unsigned int *rdata_len)
 {
 	NTSTATUS ret=NT_STATUS_OK;
 
@@ -115,7 +115,7 @@
 {
 	int data_len = 0;
 	int param_len = 0;
-	int rparam_len, rdata_len;
+	unsigned int rparam_len, rdata_len;
 	pstring param, data;
 	NTSTATUS status;
 
@@ -253,7 +253,7 @@
 			 int op,
 			 char *param, char *data,
 			 int param_len, int data_len,
-			 int *rparam_len, int *rdata_len)
+			 unsigned int *rparam_len, unsigned int *rdata_len)
 {
 	char *rparam=NULL, *rdata=NULL;
 
@@ -282,7 +282,7 @@
 			     int op, int level,
 			     char *param, char *data,
 			     int param_len, int *data_len,
-			     int *rparam_len, int *rdata_len)
+			     unsigned int *rparam_len, unsigned int *rdata_len)
 {
 	NTSTATUS ret=NT_STATUS_OK;
 
@@ -317,7 +317,7 @@
 {
 	int data_len = 0;
 	int param_len = 0;
-	int rparam_len, rdata_len;
+	unsigned int rparam_len, rdata_len;
 	pstring param, data;
 	NTSTATUS status;
 

Modified: trunk/source/utils/debug2html.c
===================================================================
--- trunk/source/utils/debug2html.c	2006-07-01 15:12:10 UTC (rev 16742)
+++ trunk/source/utils/debug2html.c	2006-07-01 15:21:17 UTC (rev 16743)
@@ -145,6 +145,8 @@
     case dbg_lineno:
       (void)printf( ")" );
       break;
+    default:
+      break;
     }
 
   switch( newtok )
@@ -158,6 +160,8 @@
     case dbg_lineno:
       (void)printf( "(" );
       break;
+    default:
+      break;
     }
   } /* newblock */