sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

Formatting fixup. Fix shadow warning.

Browse Source 
Jeremy.
(This used to be commit beb298898d5700dcd775ee3b1f1965e67214e9e5)
This commit is contained in:
Jeremy Allison 2002-07-19 16:45:37 +00:00
parent af3d6270d7
commit 5f894476d8
2 changed files with 423 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source3/registry/reg_printing.c
View File

@ -153,13 +153,13 @@ done:
Caller is responsible for freeing memory to **subkey
*********************************************************************/
BOOL printing_subkey_specific( char *key, char** subkey, uint32 index )
BOOL printing_subkey_specific( char *key, char** subkey, uint32 indx )
{
char *path;
BOOL top_level = False;
BOOL result = False;
DEBUG(10,("printing_subkey_specific: key=>[%s], index=>[%d]\n", key, index));
DEBUG(10,("printing_subkey_specific: key=>[%s], index=>[%d]\n", key, indx));
path = trim_reg_path( key );
@ -174,18 +174,18 @@ BOOL printing_subkey_specific( char *key, char** subkey, uint32 index )
/* make sure the index is in range */
if ( !(index < MAX_TOP_LEVEL_KEYS) )
if ( !(indx < MAX_TOP_LEVEL_KEYS) )
goto done;
if ( !(*subkey = malloc( strlen(top_level_keys[index])+1 )) )
if ( !(*subkey = malloc( strlen(top_level_keys[indx])+1 )) )
goto done;
strncpy( *subkey, top_level_keys[index], strlen(top_level_keys[index])+1 );
strncpy( *subkey, top_level_keys[indx], strlen(top_level_keys[indx])+1 );
result = True;
}
else {
if ( handle_printing_subpath( path, subkey, index ) != -1 )
if ( handle_printing_subpath( path, subkey, indx ) != -1 )
result = True;
}

21
source3/smbd/nttrans.c
View File

@ -79,9 +79,8 @@ static int send_nt_replies(char *inbuf, char *outbuf, int bufsize, NTSTATUS nt_e
set_message(outbuf,18,0,True);
if (NT_STATUS_V(nt_error)) {
if (NT_STATUS_V(nt_error))
ERROR_NT(nt_error);
}
/*
* If there genuinely are no parameters or data to send just send
@ -1311,6 +1310,7 @@ static int call_nt_transact_create(connection_struct *conn,
/****************************************************************************
Reply to a NT CANCEL request.
****************************************************************************/
int reply_ntcancel(connection_struct *conn,
char *inbuf,char *outbuf,int length,int bufsize)
{
@ -1332,6 +1332,7 @@ int reply_ntcancel(connection_struct *conn,
/****************************************************************************
Reply to an unsolicited SMBNTtranss - just ignore it!
****************************************************************************/
int reply_nttranss(connection_struct *conn,
char *inbuf,char *outbuf,int length,int bufsize)
{
@ -1345,6 +1346,7 @@ int reply_nttranss(connection_struct *conn,
Reply to a notify change - queue the request and
don't allow a directory to be opened.
****************************************************************************/
static int call_nt_transact_notify_change(connection_struct *conn,
char *inbuf, char *outbuf, int length,
int bufsize,
@ -1612,6 +1614,7 @@ static int call_nt_transact_ioctl(connection_struct *conn,
/****************************************************************************
Reply to a SMBNTtrans.
****************************************************************************/
int reply_nttrans(connection_struct *conn,
char *inbuf,char *outbuf,int length,int bufsize)
{
@ -1684,8 +1687,7 @@ due to being in oplock break state.\n" ));
return ERROR_DOS(ERRDOS,ERRnomem);
}
/* Copy the param and data bytes sent with this request into
the params buffer */
/* Copy the param and data bytes sent with this request into the params buffer */
num_params_sofar = parameter_count;
num_data_sofar = data_count;
@ -1757,14 +1759,15 @@ due to being in oplock break state.\n" ));
switch(function_code) {
case NT_TRANSACT_CREATE:
START_PROFILE_NESTED(NT_transact_create);
outsize = call_nt_transact_create(conn, inbuf, outbuf, length, bufsize,
outsize = call_nt_transact_create(conn, inbuf, outbuf,
length, bufsize,
&setup, &params, &data);
END_PROFILE_NESTED(NT_transact_create);
break;
case NT_TRANSACT_IOCTL:
START_PROFILE_NESTED(NT_transact_ioctl);
outsize = call_nt_transact_ioctl(conn,
inbuf, outbuf, length, bufsize,
outsize = call_nt_transact_ioctl(conn, inbuf, outbuf,
length, bufsize,
&setup, &params, &data);
END_PROFILE_NESTED(NT_transact_ioctl);
break;
@ -1784,8 +1787,8 @@ due to being in oplock break state.\n" ));
break;
case NT_TRANSACT_RENAME:
START_PROFILE_NESTED(NT_transact_rename);
outsize = call_nt_transact_rename(conn, inbuf, outbuf, length,
bufsize,
outsize = call_nt_transact_rename(conn, inbuf, outbuf,
length, bufsize,
&setup, &params, &data);
END_PROFILE_NESTED(NT_transact_rename);
break;