diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-03-22 13:06:52 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-03-22 13:06:52 +0000 |
| commit | a38e5e6850220fc1a0afa5097359c05458e1ae41 (patch) | |
| tree | b75cac324259de694c3bc3f7ca18ab664a4fa856 /source3/smbd/process.c | |
| parent | b508fdfc231b73d671b0c283e54532b9f14d7db6 (diff) | |
| download | samba-a38e5e6850220fc1a0afa5097359c05458e1ae41.tar.gz samba-a38e5e6850220fc1a0afa5097359c05458e1ae41.tar.bz2 samba-a38e5e6850220fc1a0afa5097359c05458e1ae41.zip | |
Small clenaup patches:
- safe_string.h - don't assume that __FUNCTION__ is available
- process.c - use new workaround from safe_string.h for the same
- util.c - Show how many bytes we smb_panic()ed trying to smb_xmalloc()
- gencache.c - Keep valgrind quiet by always null terminating.
- clistr.c - Add copyright
- srvstr.h - move srvstr_push into a .c file again, as a real function.
- srvstr.c - revive, with 'safe' checked srvstr_push
- loadparm.c - set a default for the display charset.
Andrew Bartlett
(This used to be commit a7eba37aadeb0b04cb1bd89deddb58be8aba825c)
Diffstat (limited to 'source3/smbd/process.c')
| -rw-r--r-- | source3/smbd/process.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c index c3fbc22e94..16ef30c46c 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -1256,8 +1256,8 @@ void smbd_process(void) if ((InBuffer == NULL) || (OutBuffer == NULL)) return; - clobber_region(__FUNCTION__, __LINE__, InBuffer, total_buffer_size); - clobber_region(__FUNCTION__, __LINE__, OutBuffer, total_buffer_size); + clobber_region(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, InBuffer, total_buffer_size); + clobber_region(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, OutBuffer, total_buffer_size); max_recv = MIN(lp_maxxmit(),BUFFER_SIZE); @@ -1282,7 +1282,7 @@ void smbd_process(void) num_smbs = 0; /* Reset smb counter. */ } - clobber_region(__FUNCTION__, __LINE__, InBuffer, total_buffer_size); + clobber_region(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, InBuffer, total_buffer_size); while (!receive_message_or_smb(InBuffer,BUFFER_SIZE+LARGE_WRITEX_HDR_SIZE,select_timeout)) { if(!timeout_processing( deadtime, &select_timeout, &last_timeout_processing_time)) @@ -1301,7 +1301,7 @@ void smbd_process(void) */ num_echos = smb_echo_count; - clobber_region(__FUNCTION__, __LINE__, OutBuffer, total_buffer_size); + clobber_region(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, OutBuffer, total_buffer_size); process_smb(InBuffer, OutBuffer); |