svn commit: samba r16219 - branches/SAMBA_3_0/source/smbd branches/SAMBA_3_0/source/utils trunk/source/smbd trunk/source/utils

[jerry at samba.org]

Author: jerry
Date: 2006-06-14 12:00:53 +0000 (Wed, 14 Jun 2006)
New Revision: 16219

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

Log:
BUG 3836, 3837, 3004: compile warning fixes from Jason Mader.

Modified:
   branches/SAMBA_3_0/source/smbd/open.c
   branches/SAMBA_3_0/source/smbd/trans2.c
   branches/SAMBA_3_0/source/utils/ntlm_auth_diagnostics.c
   trunk/source/smbd/open.c
   trunk/source/smbd/trans2.c
   trunk/source/utils/ntlm_auth_diagnostics.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/open.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/open.c	2006-06-14 04:00:42 UTC (rev 16218)
+++ branches/SAMBA_3_0/source/smbd/open.c	2006-06-14 12:00:53 UTC (rev 16219)
@@ -1107,7 +1107,6 @@
 	uint32 existing_dos_attributes = 0;
 	struct pending_message_list *pml = NULL;
 	uint16 mid = get_current_mid();
-	BOOL delayed_for_oplocks = False;
 	struct timeval request_time = timeval_zero();
 	struct share_mode_lock *lck = NULL;
 	NTSTATUS status;
@@ -1148,7 +1147,6 @@
 		   see if this has timed out. */
 
 		request_time = pml->request_time;
-		delayed_for_oplocks = state->delayed_for_oplocks;
 
 		/* Remove the deferred open entry under lock. */
 		lck = get_share_mode_lock(NULL, state->dev, state->inode, NULL, NULL);

Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/trans2.c	2006-06-14 04:00:42 UTC (rev 16218)
+++ branches/SAMBA_3_0/source/smbd/trans2.c	2006-06-14 12:00:53 UTC (rev 16219)
@@ -2813,7 +2813,6 @@
 	char *fullpathname;
 	char *base_name;
 	char *p;
-	char *lock_data = NULL;
 	SMB_OFF_T pos = 0;
 	BOOL bad_path = False;
 	BOOL delete_pending = False;
@@ -2823,6 +2822,9 @@
 	TALLOC_CTX *data_ctx = NULL;
 	struct ea_list *ea_list = NULL;
 	uint32 access_mask = 0x12019F; /* Default - GENERIC_EXECUTE mapping from Windows */
+#if defined(DEVELOPER)
+	char *lock_data = NULL;
+#endif
 
 	if (!params)
 		return ERROR_NT(NT_STATUS_INVALID_PARAMETER);

Modified: branches/SAMBA_3_0/source/utils/ntlm_auth_diagnostics.c
===================================================================
--- branches/SAMBA_3_0/source/utils/ntlm_auth_diagnostics.c	2006-06-14 04:00:42 UTC (rev 16218)
+++ branches/SAMBA_3_0/source/utils/ntlm_auth_diagnostics.c	2006-06-14 12:00:53 UTC (rev 16219)
@@ -470,7 +470,7 @@
 				     CH_DOS, password,
 				     strlen(password)+1, 
 				     (void**)&lm_response.data,True)) == -1) {
-		DEBUG(0, ("push_ascii_allocate failed!\n"));
+		DEBUG(0, ("convert_string_allocate failed!\n"));
 		exit(1);
 	}
 

Modified: trunk/source/smbd/open.c
===================================================================
--- trunk/source/smbd/open.c	2006-06-14 04:00:42 UTC (rev 16218)
+++ trunk/source/smbd/open.c	2006-06-14 12:00:53 UTC (rev 16219)
@@ -1108,7 +1108,6 @@
 	uint32 existing_dos_attributes = 0;
 	struct pending_message_list *pml = NULL;
 	uint16 mid = get_current_mid();
-	BOOL delayed_for_oplocks = False;
 	struct timeval request_time = timeval_zero();
 	struct share_mode_lock *lck = NULL;
 	NTSTATUS status;
@@ -1149,7 +1148,6 @@
 		   see if this has timed out. */
 
 		request_time = pml->request_time;
-		delayed_for_oplocks = state->delayed_for_oplocks;
 
 		/* Remove the deferred open entry under lock. */
 		lck = get_share_mode_lock(NULL, state->dev, state->inode, NULL, NULL);

Modified: trunk/source/smbd/trans2.c
===================================================================
--- trunk/source/smbd/trans2.c	2006-06-14 04:00:42 UTC (rev 16218)
+++ trunk/source/smbd/trans2.c	2006-06-14 12:00:53 UTC (rev 16219)
@@ -2813,7 +2813,6 @@
 	char *fullpathname;
 	char *base_name;
 	char *p;
-	char *lock_data = NULL;
 	SMB_OFF_T pos = 0;
 	BOOL bad_path = False;
 	BOOL delete_pending = False;
@@ -2823,6 +2822,9 @@
 	TALLOC_CTX *data_ctx = NULL;
 	struct ea_list *ea_list = NULL;
 	uint32 access_mask = 0x12019F; /* Default - GENERIC_EXECUTE mapping from Windows */
+#if defined(DEVELOPER)
+	char *lock_data = NULL;
+#endif
 
 	if (!params)
 		return ERROR_NT(NT_STATUS_INVALID_PARAMETER);

Modified: trunk/source/utils/ntlm_auth_diagnostics.c
===================================================================
--- trunk/source/utils/ntlm_auth_diagnostics.c	2006-06-14 04:00:42 UTC (rev 16218)
+++ trunk/source/utils/ntlm_auth_diagnostics.c	2006-06-14 12:00:53 UTC (rev 16219)
@@ -470,7 +470,7 @@
 				     CH_DOS, password,
 				     strlen(password)+1, 
 				     (void**)&lm_response.data,True)) == -1) {
-		DEBUG(0, ("push_ascii_allocate failed!\n"));
+		DEBUG(0, ("convert_string_allocate failed!\n"));
 		exit(1);
 	}