From 9351abc40f98a4d34f197b8fe4c30025c16d84ad Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Thu, 2 Jan 2014 23:35:00 +0000 Subject: [PATCH] [QA] Add default cases for all switch statements. --- src/degrees_converters.c | 1 + src/dems.c | 1 + src/print.c | 5 ++++- src/uibuilder.c | 2 ++ src/vikcoordlayer.c | 2 ++ src/vikdemlayer.c | 2 ++ src/vikgeoreflayer.c | 2 ++ src/vikmapslayer.c | 2 ++ src/viktrwlayer.c | 3 +++ 9 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/degrees_converters.c b/src/degrees_converters.c index 0b29eb07..f78b178f 100644 --- a/src/degrees_converters.c +++ b/src/degrees_converters.c @@ -190,6 +190,7 @@ gdouble convert_dms_to_dec(const gchar *dms) case 3: s = value; break; + default: break; } } } while (ptr != NULL && endptr != NULL); diff --git a/src/dems.c b/src/dems.c index 08605e0d..5845db1d 100644 --- a/src/dems.c +++ b/src/dems.c @@ -231,6 +231,7 @@ static gboolean get_elev_by_coord(gpointer key, LoadedDEM *ldem, CoordElev *ce) case VIK_DEM_INTERPOL_BEST: ce->elev = vik_dem_get_shepard_interpol(dem, lon, lat); break; + default: break; } return (ce->elev != VIK_DEM_INVALID_ELEVATION); } diff --git a/src/print.c b/src/print.c index c5e7186c..285e3af2 100644 --- a/src/print.c +++ b/src/print.c @@ -238,6 +238,7 @@ static void draw_page_cairo(GtkPrintContext *context, PrintData *data) case 4: copy_row_from_rgba (surface_pixels, pixbuf_pixels, data->width); break; + default: break; } } @@ -483,7 +484,9 @@ static void update_offsets (CustomWidgetInfo *info) data->offset_x = offset_x_max / 2.0; data->offset_y = offset_y_max / 2.0; break; - } + + default: break; + } } static void center_changed_cb (GtkWidget *combo, CustomWidgetInfo *info) diff --git a/src/uibuilder.c b/src/uibuilder.c index 67a7bcd1..5e883652 100644 --- a/src/uibuilder.c +++ b/src/uibuilder.c @@ -219,6 +219,7 @@ GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data gtk_scale_set_digits ( GTK_SCALE(rv), scale->digits ); gtk_range_set_value ( GTK_RANGE(rv), init_val ); } + default: break; } if ( rv && !gtk_widget_get_tooltip_text ( rv ) ) { if ( param->tooltip ) @@ -300,6 +301,7 @@ VikLayerParamData a_uibuilder_widget_get_value ( GtkWidget *widget, VikLayerPara else rv.d = gtk_range_get_value ( GTK_RANGE(widget) ); break; + default: break; } // Perform conversion if necessary diff --git a/src/vikcoordlayer.c b/src/vikcoordlayer.c index 34897c0a..40c0cf4a 100644 --- a/src/vikcoordlayer.c +++ b/src/vikcoordlayer.c @@ -174,6 +174,7 @@ gboolean coord_layer_set_param ( VikCoordLayer *vcl, guint16 id, VikLayerParamDa case PARAM_COLOR: vcl->color = data.c; break; case PARAM_MIN_INC: vcl->deg_inc = data.d / 60.0; break; case PARAM_LINE_THICKNESS: if ( data.u >= 1 && data.u <= 15 ) vcl->line_thickness = data.u; break; + default: break; } return TRUE; } @@ -186,6 +187,7 @@ static VikLayerParamData coord_layer_get_param ( VikCoordLayer *vcl, guint16 id, case PARAM_COLOR: rv.c = vcl->color; break; case PARAM_MIN_INC: rv.d = vcl->deg_inc * 60.0; break; case PARAM_LINE_THICKNESS: rv.i = vcl->line_thickness; break; + default: break; } return rv; } diff --git a/src/vikdemlayer.c b/src/vikdemlayer.c index 432707aa..5cca6648 100644 --- a/src/vikdemlayer.c +++ b/src/vikdemlayer.c @@ -434,6 +434,7 @@ gboolean dem_layer_set_param ( VikDEMLayer *vdl, guint16 id, VikLayerParamData d } break; } + default: break; } return TRUE; } @@ -469,6 +470,7 @@ static VikLayerParamData dem_layer_get_param ( VikDEMLayer *vdl, guint16 id, gbo else rv.d = vdl->max_elev; break; + default: break; } return rv; } diff --git a/src/vikgeoreflayer.c b/src/vikgeoreflayer.c index 134e64e6..caef8bac 100644 --- a/src/vikgeoreflayer.c +++ b/src/vikgeoreflayer.c @@ -220,6 +220,7 @@ static gboolean georef_layer_set_param ( VikGeorefLayer *vgl, guint16 id, VikLay case PARAM_CE: vgl->corner.easting = data.d; break; case PARAM_MN: vgl->mpp_northing = data.d; break; case PARAM_ME: vgl->mpp_easting = data.d; break; + default: break; } return TRUE; } @@ -249,6 +250,7 @@ static VikLayerParamData georef_layer_get_param ( VikGeorefLayer *vgl, guint16 i case PARAM_CE: rv.d = vgl->corner.easting; break; case PARAM_MN: rv.d = vgl->mpp_northing; break; case PARAM_ME: rv.d = vgl->mpp_easting; break; + default: break; } return rv; } diff --git a/src/vikmapslayer.c b/src/vikmapslayer.c index e7db4127..6f11f7d9 100644 --- a/src/vikmapslayer.c +++ b/src/vikmapslayer.c @@ -582,6 +582,7 @@ static gboolean maps_layer_set_param ( VikMapsLayer *vml, guint16 id, VikLayerPa vml->xmapzoom = __mapzooms_x [data.u]; vml->ymapzoom = __mapzooms_y [data.u]; }else g_warning (_("Unknown Map Zoom")); break; + default: break; } return TRUE; } @@ -621,6 +622,7 @@ static VikLayerParamData maps_layer_get_param ( VikMapsLayer *vml, guint16 id, g case PARAM_AUTODOWNLOAD: rv.u = vml->autodownload; break; case PARAM_ONLYMISSING: rv.u = vml->adl_only_missing; break; case PARAM_MAPZOOM: rv.u = vml->mapzoom_id; break; + default: break; } return rv; } diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c index 171eddea..a629f4c4 100644 --- a/src/viktrwlayer.c +++ b/src/viktrwlayer.c @@ -2334,6 +2334,7 @@ static void trw_layer_draw_waypoint ( const gpointer id, VikWaypoint *wp, struct case WP_SYMBOL_CIRCLE: vik_viewport_draw_arc ( dp->vp, dp->vtl->waypoint_gc, TRUE, x - dp->vtl->wp_size, y - dp->vtl->wp_size, dp->vtl->wp_size, dp->vtl->wp_size, 0, 360*64 ); break; case WP_SYMBOL_X: vik_viewport_draw_line ( dp->vp, dp->vtl->waypoint_gc, x - dp->vtl->wp_size*2, y - dp->vtl->wp_size*2, x + dp->vtl->wp_size*2, y + dp->vtl->wp_size*2 ); vik_viewport_draw_line ( dp->vp, dp->vtl->waypoint_gc, x - dp->vtl->wp_size*2, y + dp->vtl->wp_size*2, x + dp->vtl->wp_size*2, y - dp->vtl->wp_size*2 ); + default: break; } } else { @@ -2343,6 +2344,7 @@ static void trw_layer_draw_waypoint ( const gpointer id, VikWaypoint *wp, struct case WP_SYMBOL_CIRCLE: vik_viewport_draw_arc ( dp->vp, dp->vtl->waypoint_gc, TRUE, x-dp->vtl->wp_size/2, y-dp->vtl->wp_size/2, dp->vtl->wp_size, dp->vtl->wp_size, 0, 360*64 ); break; case WP_SYMBOL_X: vik_viewport_draw_line ( dp->vp, dp->vtl->waypoint_gc, x-dp->vtl->wp_size, y-dp->vtl->wp_size, x+dp->vtl->wp_size, y+dp->vtl->wp_size ); vik_viewport_draw_line ( dp->vp, dp->vtl->waypoint_gc, x-dp->vtl->wp_size, y+dp->vtl->wp_size, x+dp->vtl->wp_size, y-dp->vtl->wp_size ); break; + default: break; } } @@ -2722,6 +2724,7 @@ static gboolean trw_layer_sublayer_toggle_visible ( VikTrwLayer *l, gint subtype else return TRUE; } + default: break; } return TRUE; } -- 2.39.5