diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-10-05 00:29:09 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-10-06 10:41:44 -0700 |
| commit | 4b12f28ca453b038fdeca8e6ada106e0c157296b (patch) | |
| tree | ae6c72da921baf80870ea57a5ec4ea9126fe201c /file.c | |
| parent | 3e0ecb5ff6a95e1be8f22359048e4dfa85d165bc (diff) | |
| download | subsurface-4b12f28ca453b038fdeca8e6ada106e0c157296b.tar.gz | |
First steps towards removing glib dependencies
- remove the build flags and libraries from the Makefile / Configure.mk
- remove the glib types (gboolean, gchar, gint64, gint)
- comment out / hack around gettext
- replace the glib file helper functions
- replace g_ascii_strtod
- replace g_build_filename
- use environment variables instead of g_get_home_dir() & g_get_user_name()
- comment out GPS string parsing (uses glib utf8 macros)
This needs massive cleanup, but it's a snapshot of what I have right now, in
case people want to look at it.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -4,7 +4,12 @@ #include <stdlib.h> #include <string.h> #include <errno.h> +#if 0 #include <glib/gi18n.h> +#else /* stupid */ +#define _(arg) arg +#define N_(arg) arg +#endif #include <zip.h> #include "dive.h" @@ -24,7 +29,7 @@ int readfile(const char *filename, struct memblock *mem) mem->buffer = NULL; mem->size = 0; - fd = g_open(filename, O_RDONLY | O_BINARY, 0); + fd = open(filename, O_RDONLY | O_BINARY, 0); if (fd < 0) return fd; ret = fstat(fd, &st); @@ -232,7 +237,7 @@ static int try_to_open_csv(const char *filename, struct memblock *mem, enum csv_ struct sample *sample; errno = 0; - val = g_ascii_strtod(p,&end); + val = strtod(p,&end); // FIXME == localization issue if (end == p) break; if (errno) |