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

Rename helper function and make it global

Browse source 
save_one_dive_to_mb() is very useful (but there was a namespace collision
with another helper in save_git.c)

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-04-28 11:27:36 -07:00
parent c519d0b32f
commit f4677d7604
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dive.h
View file

@ -661,6 +661,9 @@ extern int save_dives_logic(const char *filename, bool select_only);
extern int save_dive(FILE *f, struct dive *dive); extern int save_dive(FILE *f, struct dive *dive);
extern int export_dives_xslt(const char *filename, const bool selected, const int units, const char *export_xslt); extern int export_dives_xslt(const char *filename, const bool selected, const int units, const char *export_xslt);
struct membuffer;
extern void save_one_dive_to_mb(struct membuffer *b, struct dive *dive);
struct git_oid; struct git_oid;
struct git_repository; struct git_repository;
#define dummy_git_repository ((git_repository *)3ul) /* Random bogus pointer, not NULL */ #define dummy_git_repository ((git_repository *)3ul) /* Random bogus pointer, not NULL */

10
save-xml.c
View file

@ -385,7 +385,7 @@ static void save_picture(struct membuffer *b, struct picture *pic)
put_string(b, "/>\n"); put_string(b, "/>\n");
} }
void save_one_dive(struct membuffer *b, struct dive *dive) void save_one_dive_to_mb(struct membuffer *b, struct dive *dive)
{ {
struct divecomputer *dc; struct divecomputer *dc;
@ -420,7 +420,7 @@ int save_dive(FILE *f, struct dive *dive)
{ {
struct membuffer buf = { 0 }; struct membuffer buf = { 0 };
save_one_dive(&buf, dive); save_one_dive_to_mb(&buf, dive);
flush_buffer(&buf, f); flush_buffer(&buf, f);
/* Error handling? */ /* Error handling? */
return 0; return 0;
@ -445,7 +445,7 @@ static void save_trip(struct membuffer *b, dive_trip_t *trip)
*/ */
for_each_dive(i, dive) { for_each_dive(i, dive) {
if (dive->divetrip == trip) if (dive->divetrip == trip)
save_one_dive(b, dive); save_one_dive_to_mb(b, dive);
} }
put_format(b, "</trip>\n"); put_format(b, "</trip>\n");
@ -542,14 +542,14 @@ void save_dives_buffer(struct membuffer *b, const bool select_only)
if (!dive->selected) if (!dive->selected)
continue; continue;
save_one_dive(b, dive); save_one_dive_to_mb(b, dive);
} else { } else {
trip = dive->divetrip; trip = dive->divetrip;
/* Bare dive without a trip? */ /* Bare dive without a trip? */
if (!trip) { if (!trip) {
save_one_dive(b, dive); save_one_dive_to_mb(b, dive);
continue; continue;
} }