osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

catapult_dct2000: code restyle 

Remove a clang 3.7 complain.

Change-Id: I5237b130dcd0ffd3a4ea61a3c98fa344fddbe633
Reviewed-on: https://code.wireshark.org/review/10834
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Dario Lombardo 2015-10-06 13:55:07 +02:00 committed by Alexis La Goutte
parent 2bd7c48b44
commit 5f2576be3b
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wiretap/catapult_dct2000.c
View File

@ -1565,7 +1565,6 @@ packet_offset_hash_func(gconstpointer v)
static gboolean
get_file_time_stamp(gchar *linebuff, time_t *secs, guint32 *usecs)
{
int n;
struct tm tm;
#define MAX_MONTH_LETTERS 9
char month[MAX_MONTH_LETTERS+1];
@ -1578,12 +1577,14 @@ get_file_time_stamp(gchar *linebuff, time_t *secs, guint32 *usecs)
return FALSE;
}
/**************************************************************/
/* First is month. Read until get a space following the month */
for (n=0; (linebuff[n] != ' ') && (n < MAX_MONTH_LETTERS); n++) {
month[n] = linebuff[n];
/********************************************************/
/* Scan for all fields */
scan_found = sscanf(linebuff, "%9s %2d, %4d %2d:%2d:%2d.%4u",
month, &day, &year, &hour, &minute, &second, usecs);
if (scan_found != 7) {
/* Give up if not all found */
return FALSE;
}
month[n] = '\0';
if (strcmp(month, "January" ) == 0) tm.tm_mon = 0;
else if (strcmp(month, "February" ) == 0) tm.tm_mon = 1;
@ -1601,17 +1602,6 @@ get_file_time_stamp(gchar *linebuff, time_t *secs, guint32 *usecs)
/* Give up if not found a properly-formatted date */
return FALSE;
}
/* Skip space char */
n++;
/********************************************************/
/* Scan for remaining numerical fields */
scan_found = sscanf(linebuff+n, "%2d, %4d %2d:%2d:%2d.%4u",
&day, &year, &hour, &minute, &second, usecs);
if (scan_found != 6) {
/* Give up if not all found */
return FALSE;
}
/******************************************************/
/* Fill in remaining fields and return it in a time_t */