diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-07-04 07:36:09 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-07-04 07:36:09 +0000 |
| commit | 527e824293ee934ca5da0ef5424efe5ab7757248 (patch) | |
| tree | dd86fab3b0ba9cdbd86661dfae562fa123a8f53c /source3/printing/print_svid.c | |
| parent | 87fbb7092b8f8b2f0db0f361c3d625e19de57cd9 (diff) | |
| download | samba-527e824293ee934ca5da0ef5424efe5ab7757248.tar.gz samba-527e824293ee934ca5da0ef5424efe5ab7757248.tar.bz2 samba-527e824293ee934ca5da0ef5424efe5ab7757248.zip | |
strchr and strrchr are macros when compiling with optimisation in gcc, so we can't redefine them. damn.
(This used to be commit c41fc06376d1a2b83690612304e85010b5e5f3cf)
Diffstat (limited to 'source3/printing/print_svid.c')
| -rw-r--r-- | source3/printing/print_svid.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/printing/print_svid.c b/source3/printing/print_svid.c index 301f388671..22ddbe70b9 100644 --- a/source3/printing/print_svid.c +++ b/source3/printing/print_svid.c @@ -59,8 +59,8 @@ static void populate_printers(void) char *buf = lines[i]; /* eat "system/device for " */ - if (((tmp = strchr(buf, ' ')) == NULL) || - ((tmp = strchr(++tmp, ' ')) == NULL)) + if (((tmp = strchr_m(buf, ' ')) == NULL) || + ((tmp = strchr_m(++tmp, ' ')) == NULL)) continue; /* @@ -68,13 +68,13 @@ static void populate_printers(void) */ if(!strncmp("for ",++tmp,4)) { - tmp=strchr(tmp, ' '); + tmp=strchr_m(tmp, ' '); tmp++; } name = tmp; /* truncate the ": ..." */ - if ((tmp = strchr(name, ':')) != NULL) + if ((tmp = strchr_m(name, ':')) != NULL) *tmp = '\0'; /* add it to the cache */ |