mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make a few functions of static linkage

Browse source 
Make functions in core/file.c, core/parse.c and core/import-csv.c
that were not used outside their translation unit of static linkage.

parse_date is moved from core/file.c to core/import-csv.c, since it
is used only there.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-01-07 18:53:40 +01:00 • committed by mturkia
parent fa5865a566
commit afeb2e3652
6 changed files with 43 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

35
core/file.c
View file

@ -115,7 +115,7 @@ int try_to_open_zip(const char *filename)
return success;
}
int db_test_func(void *param, int columns, char **data, char **column)
static int db_test_func(void *param, int columns, char **data, char **column)
{
(void) param;
(void) columns;
@ -186,38 +186,6 @@ static int try_to_open_db(const char *filename, struct memblock *mem)
return retval;
}
timestamp_t parse_date(const char *date)
{
int hour, min, sec;
struct tm tm;
char *p;
memset(&tm, 0, sizeof(tm));
tm.tm_mday = strtol(date, &p, 10);
if (tm.tm_mday < 1 || tm.tm_mday > 31)
return 0;
for (tm.tm_mon = 0; tm.tm_mon < 12; tm.tm_mon++) {
if (!memcmp(p, monthname(tm.tm_mon), 3))
break;
}
if (tm.tm_mon > 11)
return 0;
date = p + 3;
tm.tm_year = strtol(date, &p, 10);
if (date == p)
return 0;
if (tm.tm_year < 70)
tm.tm_year += 2000;
if (tm.tm_year < 100)
tm.tm_year += 1900;
if (sscanf(p, "%d:%d:%d", &hour, &min, &sec) != 3)
return 0;
tm.tm_hour = hour;
tm.tm_min = min;
tm.tm_sec = sec;
return utc_mktime(&tm);
}
/*
* Cochran comma-separated values: depth in feet, temperature in F, pressure in psi.
*
@ -389,4 +357,3 @@ int parse_file(const char *filename)
free(mem.buffer);
return ret;
}