diff options
| author | Wayne Davison <wayned@samba.org> | 2005-01-28 21:01:21 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2005-01-28 21:01:21 +0000 |
| commit | 5f238db203f4ba876cfa8949f87f3f93507c049f (patch) | |
| tree | 8bd8cbe14d6e94531fffe53e1221478375f1db41 /lib | |
| parent | 422696201acf424dc0c46558f993d27e86bddd1b (diff) | |
| download | android_external_rsync-5f238db203f4ba876cfa8949f87f3f93507c049f.tar.gz android_external_rsync-5f238db203f4ba876cfa8949f87f3f93507c049f.tar.bz2 android_external_rsync-5f238db203f4ba876cfa8949f87f3f93507c049f.zip | |
- Use "uchar" instead of "unsigned char".
- Tweaked an initializer to try to avoid a compiler warning.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/wildmatch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/wildmatch.c b/lib/wildmatch.c index 8de33c32..980bc49f 100644 --- a/lib/wildmatch.c +++ b/lib/wildmatch.c @@ -57,10 +57,10 @@ int wildmatch_iteration_count; #endif -static int domatch(const unsigned char *p, const unsigned char *text) +static int domatch(const uchar *p, const uchar *text) { int matched, special; - unsigned char ch, prev; + uchar ch, prev; #ifdef WILD_TEST_ITERATIONS wildmatch_iteration_count++; @@ -141,9 +141,9 @@ static int domatch(const unsigned char *p, const unsigned char *text) ch = 0; /* This makes "prev" get set to 0. */ } else if (ch == '[' && p[1] == ':') { - const unsigned char *s = p += 2; + const uchar *s; int i; - while ((ch = *p) && ch != ']') p++; + for (s = p += 2; (ch = *p) && ch != ']'; p++) {} if (!ch) return ABORT_ALL; i = p - s - 1; @@ -225,5 +225,5 @@ int wildmatch(const char *p, const char *t) #ifdef WILD_TEST_ITERATIONS wildmatch_iteration_count = 0; #endif - return domatch((const unsigned char*)p, (const unsigned char*)t) == TRUE; + return domatch((const uchar*)p, (const uchar*)t) == TRUE; } |