Skip to content

Commit f474c3f

Browse files
committedDec 7, 2014
Revert 8e53443 - adding default cases
Too noisy for unreachable code.
1 parent ad8a961 commit f474c3f

9 files changed

+13
-30
lines changed
 

‎src/rasqal_literal.c

-1
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,6 @@ rasqal_new_numeric_literal(rasqal_world* world, rasqal_literal_type type,
510510
case RASQAL_LITERAL_QNAME:
511511
case RASQAL_LITERAL_VARIABLE:
512512
case RASQAL_LITERAL_UDT:
513-
default:
514513
RASQAL_FATAL2("Unexpected numeric type %u", type);
515514
}
516515

‎src/rasqal_query.c

-4
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,6 @@ rasqal_query_set_feature(rasqal_query* query, rasqal_feature feature, int value)
311311

312312
query->features[RASQAL_GOOD_CAST(int, feature)] = value;
313313
break;
314-
default:
315-
return -1;
316314
}
317315

318316
return 0;
@@ -374,8 +372,6 @@ rasqal_query_get_feature(rasqal_query *query, rasqal_feature feature)
374372
case RASQAL_FEATURE_RAND_SEED:
375373
result = (query->features[RASQAL_GOOD_CAST(int, feature)] != 0);
376374
break;
377-
default:
378-
return -1;
379375
}
380376

381377
return result;

‎src/rasqal_query_transform.c

-2
Original file line numberDiff line numberDiff line change
@@ -1637,7 +1637,6 @@ rasqal_query_graph_pattern_build_variables_use_map(rasqal_query* query,
16371637
case RASQAL_GRAPH_PATTERN_OPERATOR_MINUS:
16381638
case RASQAL_GRAPH_PATTERN_OPERATOR_VALUES:
16391639
case RASQAL_GRAPH_PATTERN_OPERATOR_UNKNOWN:
1640-
default:
16411640
break;
16421641
}
16431642

@@ -1950,7 +1949,6 @@ rasqal_query_graph_pattern_build_variables_use_map_binds(rasqal_query* query,
19501949
case RASQAL_GRAPH_PATTERN_OPERATOR_SERVICE:
19511950
case RASQAL_GRAPH_PATTERN_OPERATOR_MINUS:
19521951
case RASQAL_GRAPH_PATTERN_OPERATOR_UNKNOWN:
1953-
default:
19541952
break;
19551953
}
19561954

‎src/rasqal_query_write.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -994,9 +994,8 @@ rasqal_query_write_graphref(sparql_writer_context* wc,
994994
case RASQAL_UPDATE_GRAPH_ALL:
995995
raptor_iostream_counted_string_write(" ALL", 4, iostr);
996996
break;
997-
998-
default:
999-
break;
997+
998+
/* default: case not necessary */
1000999
}
10011000

10021001
return 0;

‎src/rasqal_result_formats.c

-1
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,6 @@ rasqal_query_results_formatter_read(rasqal_world *world,
614614
case RASQAL_QUERY_RESULTS_GRAPH:
615615
case RASQAL_QUERY_RESULTS_SYNTAX:
616616
case RASQAL_QUERY_RESULTS_UNKNOWN:
617-
default:
618617
/* failure */
619618
rasqal_log_error_simple(world, RAPTOR_LOG_LEVEL_ERROR, NULL,
620619
"Cannot read '%s' query results format\n",

‎src/rasqal_update.c

-3
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,6 @@ rasqal_update_operation_print(rasqal_update_operation *update, FILE* stream)
199199
case RASQAL_UPDATE_GRAPH_ALL:
200200
fputs(", applies: all", stream);
201201
break;
202-
203-
default:
204-
break;
205202
}
206203

207204
if(update->insert_templates) {

‎utils/check_query.c

+5-8
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,11 @@ main(int argc, char *argv[])
256256
break;
257257

258258
switch (c) {
259+
case 0:
260+
case '?': /* getopt() - unknown option */
261+
usage = 1;
262+
break;
263+
259264
case 'd':
260265
verbose++;
261266
break;
@@ -337,12 +342,6 @@ main(int argc, char *argv[])
337342
}
338343
break;
339344

340-
case 0:
341-
case '?': /* getopt() - unknown option */
342-
default:
343-
usage = 1;
344-
break;
345-
346345
}
347346

348347
} /* end while option */
@@ -593,7 +592,6 @@ main(int argc, char *argv[])
593592

594593
case RASQAL_QUERY_RESULTS_SYNTAX:
595594
case RASQAL_QUERY_RESULTS_UNKNOWN:
596-
default:
597595
/* failure */
598596
fprintf(stderr,
599597
"%s: Reading %s query results format is not supported",
@@ -655,7 +653,6 @@ main(int argc, char *argv[])
655653
case RASQAL_QUERY_RESULTS_GRAPH:
656654
case RASQAL_QUERY_RESULTS_SYNTAX:
657655
case RASQAL_QUERY_RESULTS_UNKNOWN:
658-
default:
659656
/* failure */
660657
fprintf(stderr, "%s: Query result format %u cannot be tested.",
661658
program, results_type);

‎utils/roqet.c

+5-7
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ roqet_log_handler(void *data, raptor_log_message *message)
168168
case RAPTOR_LOG_LEVEL_TRACE:
169169
case RAPTOR_LOG_LEVEL_DEBUG:
170170
case RAPTOR_LOG_LEVEL_INFO:
171-
default:
172171

173172
fprintf(stderr, "%s: Unexpected %s message - ", program,
174173
raptor_log_level_get_label(message->level));
@@ -940,6 +939,11 @@ main(int argc, char *argv[])
940939
break;
941940

942941
switch (c) {
942+
case 0:
943+
case '?': /* getopt() - unknown option */
944+
usage = 1;
945+
break;
946+
943947
case 'c':
944948
count = 1;
945949
break;
@@ -1191,11 +1195,6 @@ main(int argc, char *argv[])
11911195
break;
11921196
#endif
11931197

1194-
case 0:
1195-
case '?': /* getopt() - unknown option */
1196-
default:
1197-
usage = 1;
1198-
break;
11991198
}
12001199

12011200
}
@@ -1434,7 +1433,6 @@ main(int argc, char *argv[])
14341433

14351434

14361435
case MODE_EXEC_UNKNOWN:
1437-
default:
14381436
break;
14391437
}
14401438

‎utils/to-ntriples.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ to_ntriples_log_handler(void *data, raptor_log_message *message)
8989
case RAPTOR_LOG_LEVEL_TRACE:
9090
case RAPTOR_LOG_LEVEL_DEBUG:
9191
case RAPTOR_LOG_LEVEL_INFO:
92-
default:
92+
9393
fprintf(stderr, "%s: Unexpected %s message - ", program,
9494
raptor_log_level_get_label(message->level));
9595
raptor_locator_print(message->locator, stderr);

0 commit comments

Comments
 (0)
Please sign in to comment.