summaryrefslogtreecommitdiff
path: root/wsutil/strptime.c
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2010-05-29 03:34:05 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2010-05-29 03:34:05 +0000
commit7cfd2c66f9393306e560daf0f0ff0a11f238fe59 (patch)
treef52b07ac1722bec6eb3eb0c6c63e44916899db0c /wsutil/strptime.c
parent403e4e62a4147a0d8b9009413fdf5b67f3242d0d (diff)
downloadwireshark-7cfd2c66f9393306e560daf0f0ff0a11f238fe59.tar.gz
Add braces to avoid an ambiguous else
svn path=/trunk/; revision=33018
Diffstat (limited to 'wsutil/strptime.c')
-rw-r--r--wsutil/strptime.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/wsutil/strptime.c b/wsutil/strptime.c
index c1c315795b..626235f4d3 100644
--- a/wsutil/strptime.c
+++ b/wsutil/strptime.c
@@ -536,11 +536,12 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
*decided = raw;
}
#endif
- if (!match_string (HERE_AM_STR, rp))
+ if (!match_string (HERE_AM_STR, rp)) {
if (match_string (HERE_PM_STR, rp))
is_pm = 1;
else
return NULL;
+ }
break;
case 'r':
#ifdef _NL_CURRENT