diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-10-06 10:57:16 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-10-06 10:57:16 -0700 |
| commit | b3490213f42ed63bc4b05b37bcfc12809f2d432c (patch) | |
| tree | d56ede6f1ea8d20c2120eba2b9ca705927a77913 /save-xml.c | |
| parent | 92d8978ab4ad980397883b50d0e7bc81d2bf5f73 (diff) | |
| parent | 70352c3962cf3b4379590326cdc489ac0543f7e9 (diff) | |
| download | subsurface-b3490213f42ed63bc4b05b37bcfc12809f2d432c.tar.gz | |
Merge branch 'glib-removal-hack'
Fix obvious merge issue in Rules.mk
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'save-xml.c')
| -rw-r--r-- | save-xml.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/save-xml.c b/save-xml.c index 454da8484..6d95cb4f7 100644 --- a/save-xml.c +++ b/save-xml.c @@ -125,12 +125,12 @@ static void show_utf8(FILE *f, const char *text, const char *pre, const char *po if (!text) return; - while (g_ascii_isspace(*text)) + while (isspace(*text)) text++; len = strlen(text); if (!len) return; - while (len && g_ascii_isspace(text[len-1])) + while (len && isspace(text[len-1])) len--; /* FIXME! Quoting! */ fputs(pre, f); @@ -549,13 +549,13 @@ void save_dives(const char *filename) save_dives_logic(filename, FALSE); } -void save_dives_logic(const char *filename, const gboolean select_only) +void save_dives_logic(const char *filename, const bool select_only) { int i; struct dive *dive; dive_trip_t *trip; - FILE *f = g_fopen(filename, "w"); + FILE *f = fopen(filename, "w"); if (!f) return; |