diff options
author | Colin Watson <cjwatson@debian.org> | 2020-06-07 10:19:24 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-06-07 11:03:12 +0100 |
commit | 30337f8b66c66af6b368d1e3c789e75f1247176c (patch) | |
tree | 17e0b8652fea31c04faa19ffc4cd088552ee473a /openbsd-compat/fnmatch.c | |
parent | aef2be11c5ea90bc66e774923e6570213e54c195 (diff) | |
parent | 39b8d128ef980a410bb1ea0ee80e95ac9fff59c3 (diff) |
New upstream release (8.3p1)
Also update GSSAPI key exchange patch from
https://github.com/openssh-gsskex/openssh-gsskex.
Diffstat (limited to 'openbsd-compat/fnmatch.c')
-rw-r--r-- | openbsd-compat/fnmatch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openbsd-compat/fnmatch.c b/openbsd-compat/fnmatch.c index da841d203..b5641a091 100644 --- a/openbsd-compat/fnmatch.c +++ b/openbsd-compat/fnmatch.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: fnmatch.c,v 1.21 2016/03/01 20:29:03 millert Exp $ */ | 1 | /* $OpenBSD: fnmatch.c,v 1.22 2020/03/13 03:25:45 djm Exp $ */ |
2 | 2 | ||
3 | /* Copyright (c) 2011, VMware, Inc. | 3 | /* Copyright (c) 2011, VMware, Inc. |
4 | * All rights reserved. | 4 | * All rights reserved. |
@@ -294,7 +294,7 @@ int fnmatch(const char *pattern, const char *string, int flags) | |||
294 | const int leading_dir = !!(flags & FNM_LEADING_DIR); | 294 | const int leading_dir = !!(flags & FNM_LEADING_DIR); |
295 | const char *dummyptr, *matchptr, *strendseg; | 295 | const char *dummyptr, *matchptr, *strendseg; |
296 | int wild; | 296 | int wild; |
297 | /* For '*' wild processing only; surpress 'used before initialization' | 297 | /* For '*' wild processing only; suppress 'used before initialization' |
298 | * warnings with dummy initialization values; | 298 | * warnings with dummy initialization values; |
299 | */ | 299 | */ |
300 | const char *strstartseg = NULL; | 300 | const char *strstartseg = NULL; |