diff options
| -rw-r--r-- | divelist.c | 34 | ||||
| -rw-r--r-- | gtk-gui.c | 6 | ||||
| -rw-r--r-- | info.c | 6 | ||||
| -rw-r--r-- | main.c | 4 | ||||
| -rw-r--r-- | parse-xml.c | 136 |
5 files changed, 94 insertions, 92 deletions
diff --git a/divelist.c b/divelist.c index 4ab61997c..b9388f860 100644 --- a/divelist.c +++ b/divelist.c @@ -230,7 +230,7 @@ static void temperature_data_func(GtkTreeViewColumn *col, * - Nitrox trumps air (even if hypoxic) * These are the same rules as the inter-dive sorting rules. */ -static void get_dive_gas(struct dive *dive, int *o2, int *he, int *o2low) +static void get_dive_gas(struct dive *dive, int *o2_p, int *he_p, int *o2low_p) { int i; int maxo2 = -1, maxhe = -1, mino2 = 1000; @@ -260,9 +260,9 @@ newmax: /* All air? Show/sort as "air"/zero */ if (!maxhe && maxo2 == AIR_PERMILLE && mino2 == maxo2) maxo2 = mino2 = 0; - *o2 = maxo2; - *he = maxhe; - *o2low = mino2; + *o2_p = maxo2; + *he_p = maxhe; + *o2low_p = mino2; } static gint nitrox_sort_func(GtkTreeModel *model, @@ -625,7 +625,7 @@ static struct divelist_column { sort_func_t sort; unsigned int flags; int *visible; -} column[] = { +} dl_column[] = { [DIVE_NR] = { "#", NULL, NULL, ALIGN_RIGHT | UNSORTABLE }, [DIVE_DATE] = { "Date", date_data_func, NULL, ALIGN_LEFT }, [DIVE_RATING] = { UTF8_BLACKSTAR, star_data_func, NULL, ALIGN_LEFT }, @@ -642,7 +642,7 @@ static struct divelist_column { static GtkTreeViewColumn *divelist_column(struct DiveList *dl, struct divelist_column *col) { - int index = col - &column[0]; + int index = col - &dl_column[0]; const char *title = col->header; data_func_t data_func = col->data; sort_func_t sort_func = col->sort; @@ -709,17 +709,17 @@ GtkWidget *dive_list_create(void) gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_MULTIPLE); gtk_widget_set_size_request(dive_list.tree_view, 200, 200); - dive_list.nr = divelist_column(&dive_list, column + DIVE_NR); - dive_list.date = divelist_column(&dive_list, column + DIVE_DATE); - dive_list.stars = divelist_column(&dive_list, column + DIVE_RATING); - dive_list.depth = divelist_column(&dive_list, column + DIVE_DEPTH); - dive_list.duration = divelist_column(&dive_list, column + DIVE_DURATION); - dive_list.temperature = divelist_column(&dive_list, column + DIVE_TEMPERATURE); - dive_list.cylinder = divelist_column(&dive_list, column + DIVE_CYLINDER); - dive_list.nitrox = divelist_column(&dive_list, column + DIVE_NITROX); - dive_list.sac = divelist_column(&dive_list, column + DIVE_SAC); - dive_list.otu = divelist_column(&dive_list, column + DIVE_OTU); - dive_list.location = divelist_column(&dive_list, column + DIVE_LOCATION); + dive_list.nr = divelist_column(&dive_list, dl_column + DIVE_NR); + dive_list.date = divelist_column(&dive_list, dl_column + DIVE_DATE); + dive_list.stars = divelist_column(&dive_list, dl_column + DIVE_RATING); + dive_list.depth = divelist_column(&dive_list, dl_column + DIVE_DEPTH); + dive_list.duration = divelist_column(&dive_list, dl_column + DIVE_DURATION); + dive_list.temperature = divelist_column(&dive_list, dl_column + DIVE_TEMPERATURE); + dive_list.cylinder = divelist_column(&dive_list, dl_column + DIVE_CYLINDER); + dive_list.nitrox = divelist_column(&dive_list, dl_column + DIVE_NITROX); + dive_list.sac = divelist_column(&dive_list, dl_column + DIVE_SAC); + dive_list.otu = divelist_column(&dive_list, dl_column + DIVE_OTU); + dive_list.location = divelist_column(&dive_list, dl_column + DIVE_LOCATION); fill_dive_list(); @@ -245,7 +245,7 @@ GtkTreeViewColumn *tree_view_column(GtkWidget *tree_view, int index, const char return col; } -static void create_radio(GtkWidget *vbox, const char *name, ...) +static void create_radio(GtkWidget *vbox, const char *w_name, ...) { va_list args; GtkRadioButton *group = NULL; @@ -254,10 +254,10 @@ static void create_radio(GtkWidget *vbox, const char *name, ...) box = gtk_hbox_new(TRUE, 10); gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, FALSE, 0); - label = gtk_label_new(name); + label = gtk_label_new(w_name); gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 0); - va_start(args, name); + va_start(args, w_name); for (;;) { int enabled; const char *name; @@ -258,13 +258,13 @@ void add_location(const char *string) static int get_rating(const char *string) { - int rating = 0; + int rating_val = 0; int i; for (i = 0; i <= 5; i++) if (!strcmp(star_strings[i],string)) - rating = i; - return rating; + rating_val = i; + return rating_val; } struct dive_info { @@ -101,7 +101,7 @@ static gboolean imported = FALSE; * This doesn't really report anything at all. We just sort the * dives, the GUI does the reporting */ -void report_dives(gboolean imported) +void report_dives(gboolean is_imported) { int i; int preexisting = dive_table.preexisting; @@ -135,7 +135,7 @@ void report_dives(gboolean imported) i--; } - if (imported) { + if (is_imported) { /* Was the previous dive table state numbered? */ if (last && last->number) try_to_renumber(last, preexisting); diff --git a/parse-xml.c b/parse-xml.c index 6af4a9338..cc2d0076d 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -98,16 +98,16 @@ const struct units IMPERIAL_units = { /* * Dive info as it is being built up.. */ -static struct dive *dive; -static struct sample *sample; +static struct dive *cur_dive; +static struct sample *cur_sample; static struct { int active; duration_t time; int type, flags, value; const char *name; -} event; -static struct tm tm; -static int cylinder_index; +} cur_event; +static struct tm cur_tm; +static int cur_cylinder_index; static enum import_source { UNKNOWN, @@ -153,22 +153,22 @@ static void divedate(char *buffer, void *_when) time_t *when = _when; int success = 0; - success = tm.tm_sec | tm.tm_min | tm.tm_hour; + success = cur_tm.tm_sec | cur_tm.tm_min | cur_tm.tm_hour; if (sscanf(buffer, "%d.%d.%d", &d, &m, &y) == 3) { - tm.tm_year = y; - tm.tm_mon = m-1; - tm.tm_mday = d; + cur_tm.tm_year = y; + cur_tm.tm_mon = m-1; + cur_tm.tm_mday = d; } else if (sscanf(buffer, "%d-%d-%d", &y, &m, &d) == 3) { - tm.tm_year = y; - tm.tm_mon = m-1; - tm.tm_mday = d; + cur_tm.tm_year = y; + cur_tm.tm_mon = m-1; + cur_tm.tm_mday = d; } else { fprintf(stderr, "Unable to parse date '%s'\n", buffer); success = 0; } if (success) - *when = utc_mktime(&tm); + *when = utc_mktime(&cur_tm); free(buffer); } @@ -179,11 +179,11 @@ static void divetime(char *buffer, void *_when) time_t *when = _when; if (sscanf(buffer, "%d:%d:%d", &h, &m, &s) >= 2) { - tm.tm_hour = h; - tm.tm_min = m; - tm.tm_sec = s; - if (tm.tm_year) - *when = utc_mktime(&tm); + cur_tm.tm_hour = h; + cur_tm.tm_min = m; + cur_tm.tm_sec = s; + if (cur_tm.tm_year) + *when = utc_mktime(&cur_tm); } free(buffer); } @@ -197,13 +197,13 @@ static void divedatetime(char *buffer, void *_when) if (sscanf(buffer, "%d-%d-%d %d:%d:%d", &y, &m, &d, &hr, &min, &sec) == 6) { - tm.tm_year = y; - tm.tm_mon = m-1; - tm.tm_mday = d; - tm.tm_hour = hr; - tm.tm_min = min; - tm.tm_sec = sec; - *when = utc_mktime(&tm); + cur_tm.tm_year = y; + cur_tm.tm_mon = m-1; + cur_tm.tm_mday = d; + cur_tm.tm_hour = hr; + cur_tm.tm_min = min; + cur_tm.tm_sec = sec; + *when = utc_mktime(&cur_tm); } free(buffer); } @@ -378,7 +378,7 @@ static void gasmix(char *buffer, void *_fraction) /* libdivecomputer does negative percentages. */ if (*buffer == '-') return; - if (cylinder_index < MAX_CYLINDERS) + if (cur_cylinder_index < MAX_CYLINDERS) percent(buffer, _fraction); } @@ -575,8 +575,8 @@ static void eventtime(char *buffer, void *_duration) { duration_t *duration = _duration; sampletime(buffer, duration); - if (sample) - duration->seconds += sample->time.seconds; + if (cur_sample) + duration->seconds += cur_sample->time.seconds; } static void try_to_fill_event(const char *name, char *buf) @@ -584,17 +584,17 @@ static void try_to_fill_event(const char *name, char *buf) int len = strlen(name); start_match("event", name, buf); - if (MATCH(".event", utf8_string, &event.name)) + if (MATCH(".event", utf8_string, &cur_event.name)) return; - if (MATCH(".name", utf8_string, &event.name)) + if (MATCH(".name", utf8_string, &cur_event.name)) return; - if (MATCH(".time", eventtime, &event.time)) + if (MATCH(".time", eventtime, &cur_event.time)) return; - if (MATCH(".type", get_index, &event.type)) + if (MATCH(".type", get_index, &cur_event.type)) return; - if (MATCH(".flags", get_index, &event.flags)) + if (MATCH(".flags", get_index, &cur_event.flags)) return; - if (MATCH(".value", get_index, &event.value)) + if (MATCH(".value", get_index, &cur_event.value)) return; nonmatch("event", name, buf); } @@ -806,7 +806,7 @@ static int uemis_gas_template; static int uemis_cylinder_index(void *_cylinder) { cylinder_t *cylinder = _cylinder; - unsigned int index = cylinder - dive->cylinder; + unsigned int index = cylinder - cur_dive->cylinder; if (index > 6) { fprintf(stderr, "Uemis cylinder pointer calculations broken\n"); @@ -838,14 +838,14 @@ static void uemis_cylindersize(char *buffer, void *_cylinder) { int index = uemis_cylinder_index(_cylinder); if (index >= 0) - cylindersize(buffer, &dive->cylinder[index].type.size); + cylindersize(buffer, &cur_dive->cylinder[index].type.size); } static void uemis_percent(char *buffer, void *_cylinder) { int index = uemis_cylinder_index(_cylinder); if (index >= 0) - percent(buffer, &dive->cylinder[index].gasmix.o2); + percent(buffer, &cur_dive->cylinder[index].gasmix.o2); } static int uemis_dive_match(struct dive **divep, const char *name, int len, char *buf) @@ -1028,22 +1028,22 @@ static void try_to_fill_dive(struct dive **divep, const char *name, char *buf) return; if (MATCH(".rating", get_index, &dive->rating)) return; - if (MATCH(".cylinder.size", cylindersize, &dive->cylinder[cylinder_index].type.size)) + if (MATCH(".cylinder.size", cylindersize, &dive->cylinder[cur_cylinder_index].type.size)) return; - if (MATCH(".cylinder.workpressure", pressure, &dive->cylinder[cylinder_index].type.workingpressure)) + if (MATCH(".cylinder.workpressure", pressure, &dive->cylinder[cur_cylinder_index].type.workingpressure)) return; - if (MATCH(".cylinder.description", utf8_string, &dive->cylinder[cylinder_index].type.description)) + if (MATCH(".cylinder.description", utf8_string, &dive->cylinder[cur_cylinder_index].type.description)) return; - if (MATCH(".cylinder.start", pressure, &dive->cylinder[cylinder_index].start)) + if (MATCH(".cylinder.start", pressure, &dive->cylinder[cur_cylinder_index].start)) return; - if (MATCH(".cylinder.end", pressure, &dive->cylinder[cylinder_index].end)) + if (MATCH(".cylinder.end", pressure, &dive->cylinder[cur_cylinder_index].end)) return; - if (MATCH(".o2", gasmix, &dive->cylinder[cylinder_index].gasmix.o2)) + if (MATCH(".o2", gasmix, &dive->cylinder[cur_cylinder_index].gasmix.o2)) return; - if (MATCH(".n2", gasmix_nitrogen, &dive->cylinder[cylinder_index].gasmix)) + if (MATCH(".n2", gasmix_nitrogen, &dive->cylinder[cur_cylinder_index].gasmix)) return; - if (MATCH(".he", gasmix, &dive->cylinder[cylinder_index].gasmix.he)) + if (MATCH(".he", gasmix, &dive->cylinder[cur_cylinder_index].gasmix.he)) return; nonmatch("dive", name, buf); @@ -1057,32 +1057,34 @@ static void try_to_fill_dive(struct dive **divep, const char *name, char *buf) */ static void dive_start(void) { - if (dive) + if (cur_dive) return; - dive = alloc_dive(); - memset(&tm, 0, sizeof(tm)); + cur_dive = alloc_dive(); + memset(&cur_tm, 0, sizeof(cur_tm)); } static void dive_end(void) { - if (!dive) + if (!cur_dive) return; - record_dive(dive); - dive = NULL; - cylinder_index = 0; + record_dive(cur_dive); + cur_dive = NULL; + cur_cylinder_index = 0; } static void event_start(void) { - memset(&event, 0, sizeof(event)); - event.active = 1; + memset(&cur_event, 0, sizeof(cur_event)); + cur_event.active = 1; } static void event_end(void) { - if (event.name && strcmp(event.name, "surface") != 0) - add_event(dive, event.time.seconds, event.type, event.flags, event.value, event.name); - event.active = 0; + if (cur_event.name && strcmp(cur_event.name, "surface") != 0) + add_event(cur_dive, cur_event.time.seconds, + cur_event.type, cur_event.flags, + cur_event.value, cur_event.name); + cur_event.active = 0; } static void cylinder_start(void) @@ -1091,21 +1093,21 @@ static void cylinder_start(void) static void cylinder_end(void) { - cylinder_index++; + cur_cylinder_index++; } static void sample_start(void) { - sample = prepare_sample(&dive); + cur_sample = prepare_sample(&cur_dive); } static void sample_end(void) { - if (!dive) + if (!cur_dive) return; - finish_sample(dive); - sample = NULL; + finish_sample(cur_dive); + cur_sample = NULL; } static void entry(const char *name, int size, const char *raw) @@ -1116,16 +1118,16 @@ static void entry(const char *name, int size, const char *raw) return; memcpy(buf, raw, size); buf[size] = 0; - if (event.active) { + if (cur_event.active) { try_to_fill_event(name, buf); return; } - if (sample) { - try_to_fill_sample(sample, name, buf); + if (cur_sample) { + try_to_fill_sample(cur_sample, name, buf); return; } - if (dive) { - try_to_fill_dive(&dive, name, buf); + if (cur_dive) { + try_to_fill_dive(&cur_dive, name, buf); return; } } |