diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-04-21 13:05:51 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-04-21 13:05:51 +0000 |
| commit | c75af6b98034e2b6c57065468f98315c3e154885 (patch) | |
| tree | 759766a8600d64dc9971198d2da1c1d3dc874764 /source3 | |
| parent | 029f0ab20ba5aec62b330d815b195360e32c9959 (diff) | |
| download | samba-c75af6b98034e2b6c57065468f98315c3e154885.tar.gz samba-c75af6b98034e2b6c57065468f98315c3e154885.tar.bz2 samba-c75af6b98034e2b6c57065468f98315c3e154885.zip | |
Merge whitespace and const from HEAD
(This used to be commit 88fdc36f9373c63706907e48be317007aeba06d6)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/util.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index a2d8d42cbe..1adda85354 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -1040,7 +1040,7 @@ BOOL get_mydomname(fstring my_domname) Interpret a protocol description string, with a default. ****************************************************************************/ -int interpret_protocol(char *str,int def) +int interpret_protocol(const char *str,int def) { if (strequal(str,"NT1")) return(PROTOCOL_NT1); @@ -1411,15 +1411,15 @@ void smb_panic(const char *why) { extern char *global_clobber_region_function; extern unsigned int global_clobber_region_line; - + if (global_clobber_region_function) { DEBUG(0,("smb_panic: clobber_region() last called from [%s(%u)]\n", - global_clobber_region_function, - global_clobber_region_line)); + global_clobber_region_function, + global_clobber_region_line)); } } #endif - + cmd = lp_panic_action(); if (cmd && *cmd) { DEBUG(0, ("smb_panic(): calling panic action [%s]\n", cmd)); @@ -1427,10 +1427,10 @@ void smb_panic(const char *why) if (result == -1) DEBUG(0, ("smb_panic(): fork failed in panic action: %s\n", - strerror(errno))); + strerror(errno))); else DEBUG(0, ("smb_panic(): action returned status %d\n", - WEXITSTATUS(result))); + WEXITSTATUS(result))); } DEBUG(0,("PANIC: %s\n", why)); @@ -1455,8 +1455,8 @@ void smb_panic(const char *why) } /******************************************************************* - A readdir wrapper which just returns the file name. -********************************************************************/ + A readdir wrapper which just returns the file name. + ********************************************************************/ const char *readdirname(DIR *p) { |