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

Small whitespace fixes

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-05-29 07:30:33 -07:00
parent 761d1972c5
commit 881da272c4
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
save-html.c
View file

@ -123,7 +123,7 @@ void put_HTML_tags(struct membuffer *b, struct dive *dive, const char *pre, cons
void write_attribute(struct membuffer *b, const char *att_name, const char *value) void write_attribute(struct membuffer *b, const char *att_name, const char *value)
{ {
if (!value) if (!value)
value="--"; value = "--";
put_format(b, "\"%s\":\"%s\",", att_name, value); put_format(b, "\"%s\":\"%s\",", att_name, value);
} }
@ -145,12 +145,12 @@ void write_one_dive(struct membuffer *b, struct dive *dive, int *dive_no)
write_attribute(b, "divemaster", dive->divemaster); write_attribute(b, "divemaster", dive->divemaster);
write_attribute(b, "suit", dive->suit); write_attribute(b, "suit", dive->suit);
put_HTML_tags(b, dive, "\"tags\":", ","); put_HTML_tags(b, dive, "\"tags\":", ",");
put_HTML_notes(b, dive ,"\"notes\":\"" ,"\","); put_HTML_notes(b, dive, "\"notes\":\"", "\",");
put_string(b, "},\n"); put_string(b, "},\n");
(*dive_no)++; (*dive_no)++;
} }
void write_no_trip (struct membuffer *b, int *dive_no) void write_no_trip(struct membuffer *b, int *dive_no)
{ {
int i; int i;
struct dive *dive; struct dive *dive;
@ -159,30 +159,30 @@ void write_no_trip (struct membuffer *b, int *dive_no)
put_format(b, "\"name\":\"Other\","); put_format(b, "\"name\":\"Other\",");
put_format(b, "\"dives\":["); put_format(b, "\"dives\":[");
for_each_dive(i, dive) { for_each_dive (i, dive) {
if (!dive->divetrip) if (!dive->divetrip)
write_one_dive(b, dive, dive_no); write_one_dive(b, dive, dive_no);
} }
put_format(b, "]},\n\n"); put_format(b, "]},\n\n");
} }
void write_trip (struct membuffer *b, dive_trip_t *trip, int *dive_no) void write_trip(struct membuffer *b, dive_trip_t *trip, int *dive_no)
{ {
int i; int i;
struct dive *dive; struct dive *dive;
put_format(b, "{"); put_format(b, "{");
put_format(b, "\"name\":\"%s\",",trip->location); put_format(b, "\"name\":\"%s\",", trip->location);
put_format(b, "\"dives\":["); put_format(b, "\"dives\":[");
for (dive = trip->dives; dive != NULL; dive = dive->next){ for (dive = trip->dives; dive != NULL; dive = dive->next) {
write_one_dive(b, dive, dive_no); write_one_dive(b, dive, dive_no);
} }
put_format(b, "]},\n\n"); put_format(b, "]},\n\n");
} }
void write_trips(struct membuffer *b,bool selected_only) void write_trips(struct membuffer *b, bool selected_only)
{ {
int i, dive_no = 0; int i, dive_no = 0;
struct dive *dive; struct dive *dive;
@ -196,7 +196,7 @@ void write_trips(struct membuffer *b,bool selected_only)
put_format(b, "\"name\":\"Other\","); put_format(b, "\"name\":\"Other\",");
put_format(b, "\"dives\":["); put_format(b, "\"dives\":[");
for_each_dive(i, dive) { for_each_dive (i, dive) {
if (!dive->selected) if (!dive->selected)
continue; continue;
write_one_dive(b, dive, &dive_no); write_one_dive(b, dive, &dive_no);
@ -204,8 +204,7 @@ void write_trips(struct membuffer *b,bool selected_only)
put_format(b, "]},\n\n"); put_format(b, "]},\n\n");
} else { } else {
for_each_dive(i, dive) { for_each_dive (i, dive) {
trip = dive->divetrip; trip = dive->divetrip;
/*Continue if the dive have no trips or we have seen this trip before*/ /*Continue if the dive have no trips or we have seen this trip before*/
@ -222,7 +221,8 @@ void write_trips(struct membuffer *b,bool selected_only)
} }
} }
void export_list(struct membuffer *b,bool selected_only){ void export_list(struct membuffer *b, bool selected_only)
{
put_string(b, "trips=["); put_string(b, "trips=[");
write_trips(b, selected_only); write_trips(b, selected_only);
put_string(b, "]"); put_string(b, "]");

4
worldmap-save.c
View file

@ -21,7 +21,7 @@ void writeMarkers(struct membuffer *b, const bool selected_only)
int i, dive_no = 0; int i, dive_no = 0;
struct dive *dive; struct dive *dive;
for_each_dive(i, dive) { for_each_dive (i, dive) {
if (selected_only) { if (selected_only) {
if (!dive->selected) if (!dive->selected)
continue; continue;
@ -37,7 +37,7 @@ void writeMarkers(struct membuffer *b, const bool selected_only)
put_duration(b, dive->duration, translate("gettextFromC", "<p>Duration: "), translate("gettextFromC", " min</p>")); put_duration(b, dive->duration, translate("gettextFromC", "<p>Duration: "), translate("gettextFromC", " min</p>"));
put_depth(b, dive->maxdepth, translate("gettextFromC", "<p>Max Depth: "), translate("gettextFromC", " m</p>")); put_depth(b, dive->maxdepth, translate("gettextFromC", "<p>Max Depth: "), translate("gettextFromC", " m</p>"));
put_HTML_airtemp(b, dive, translate("gettextFromC", "<p>Air Temp: "), "</p>"); put_HTML_airtemp(b, dive, translate("gettextFromC", "<p>Air Temp: "), "</p>");
put_HTML_watertemp(b, dive,translate("gettextFromC", "<p>Water Temp : ") , "</p>"); put_HTML_watertemp(b, dive, translate("gettextFromC", "<p>Water Temp : "), "</p>");
put_format(b, "<p>Location : <b>%s</b></p>", quote(dive->location)); put_format(b, "<p>Location : <b>%s</b></p>", quote(dive->location));
put_HTML_notes(b, dive, translate("gettextFromC", "<p> Notes"), " </p>"); put_HTML_notes(b, dive, translate("gettextFromC", "<p> Notes"), " </p>");
put_string(b, "</p>'+'</div>'+'</div>'});\ninfowindows.push(tempinfowindow);\n"); put_string(b, "</p>'+'</div>'+'</div>'});\ninfowindows.push(tempinfowindow);\n");