diff options
| author | Jeremy Allison <jra@samba.org> | 2003-09-05 19:59:55 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-09-05 19:59:55 +0000 |
| commit | 94f59f54921174fc156fade575ca114d331b1bd8 (patch) | |
| tree | 06c2548e853c68c2bb24cce2ce3ba75eb3c8497e /source3/libsmb | |
| parent | 7544b0c77382e300da0e2daf2b325527a23e6ddc (diff) | |
| download | samba-94f59f54921174fc156fade575ca114d331b1bd8.tar.gz samba-94f59f54921174fc156fade575ca114d331b1bd8.tar.bz2 samba-94f59f54921174fc156fade575ca114d331b1bd8.zip | |
More tuning from cachegrind. Change most trim_string() calls to trim_char(0,
as that's what they do. Fix string_replace() to fast-path ascii.
Jeremy.
(This used to be commit f35e9a8b909d3c74be47083ccc4a4e91a14938db)
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/clifile.c | 5 | ||||
| -rw-r--r-- | source3/libsmb/namequery.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index f021076a46..c7f0cdb84b 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -951,8 +951,9 @@ BOOL cli_chkpath(struct cli_state *cli, const char *path) char *p; pstrcpy(path2,path); - trim_string(path2,NULL,"\\"); - if (!*path2) *path2 = '\\'; + trim_char(path2,'\0','\\'); + if (!*path2) + *path2 = '\\'; memset(cli->outbuf,'\0',smb_size); set_message(cli->outbuf,0,0,True); diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index 9875f77c72..1de7413711 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -61,7 +61,7 @@ static struct node_status *parse_node_status(char *p, int *num_names) p++; for (i=0;i< *num_names;i++) { StrnCpy(ret[i].name,p,15); - trim_string(ret[i].name,NULL," "); + trim_char(ret[i].name,'\0',' '); ret[i].type = CVAL(p,15); ret[i].flags = p[16]; p += 18; |