diff options
author | David Robillard <d@drobilla.net> | 2011-04-30 03:16:34 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-04-30 03:16:34 +0000 |
commit | 4f124c1ee7fa82e9f3641897da2af4bc122c5522 (patch) | |
tree | 4a32ff35d9d16e5ad763ad0b39ef6c5a2c327a7b | |
parent | ba95acb21e2f1eff8fe69d0cc09cd1c21434feaf (diff) | |
download | sord-4f124c1ee7fa82e9f3641897da2af4bc122c5522.tar.gz sord-4f124c1ee7fa82e9f3641897da2af4bc122c5522.tar.bz2 sord-4f124c1ee7fa82e9f3641897da2af4bc122c5522.zip |
Consistent error messages
git-svn-id: http://svn.drobilla.net/sord/trunk@101 3d64ff67-21c5-427c-a301-fe4f08042e5a
-rw-r--r-- | src/sordi.c | 12 | ||||
-rw-r--r-- | src/syntax.c | 18 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/sordi.c b/src/sordi.c index 3451935..1931b93 100644 --- a/src/sordi.c +++ b/src/sordi.c @@ -34,7 +34,7 @@ int print_version() { printf("sordi " SORD_VERSION " <http://drobilla.net/software/sord>\n"); - printf("Copyright 2011-2011 David Robillard <http://drobilla.net>.\n" + printf("Copyright 2011 David Robillard <http://drobilla.net>.\n" "\nLicense: Simplified BSD License.\n" "This is free software; you are free to change and redistribute it." "\nThere is NO WARRANTY, to the extent permitted by law.\n"); @@ -97,7 +97,7 @@ main(int argc, char** argv) return print_version(); } else if (argv[a][1] == 'o') { if (++a == argc) { - fprintf(stderr, "missing value for -o\n"); + fprintf(stderr, "Missing value for -o\n"); return 1; } if (!strcmp(argv[a], "turtle")) { @@ -105,11 +105,11 @@ main(int argc, char** argv) } else if (!strcmp(argv[a], "ntriples")) { output_syntax = SERD_NTRIPLES; } else { - fprintf(stderr, "unknown output format `%s'\n", argv[a]); + fprintf(stderr, "Unknown output format `%s'\n", argv[a]); return 1; } } else { - fprintf(stderr, "unknown option `%s'\n", argv[a]); + fprintf(stderr, "Unknown option `%s'\n", argv[a]); return print_usage(argv[0], true); } } @@ -121,11 +121,11 @@ main(int argc, char** argv) bool success = sord_read_file(sord, input, NULL, NULL); - printf("loaded %zu statements\n", sord_num_nodes(world)); + printf("Loaded %zu statements\n", sord_num_nodes(world)); SerdURI base_uri; if (!serd_uri_parse(input, &base_uri)) { - fprintf(stderr, "bad input URI `%s'\n", input); + fprintf(stderr, "Bad input URI <%s>\n", input); return 1; } diff --git a/src/syntax.c b/src/syntax.c index a0198c3..61c003d 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -95,7 +95,7 @@ sord_node_from_serd_node(ReadState* state, const SerdNode* sn, SerdChunk uri_prefix; SerdChunk uri_suffix; if (!serd_env_expand(state->env, sn, &uri_prefix, &uri_suffix)) { - fprintf(stderr, "ERROR: failed to expand qname `%s'\n", sn->buf); + fprintf(stderr, "Failed to expand qname `%s'\n", sn->buf); return NULL; } const size_t uri_len = uri_prefix.len + uri_suffix.len; @@ -184,7 +184,7 @@ sord_file_uri_to_path(const uint8_t* uri) if (serd_uri_string_has_scheme(uri)) { // Absolute URI, ensure it a file and chop scheme if (strncmp((const char*)uri, "file:", 5)) { - fprintf(stderr, "unsupported URI scheme `%s'\n", uri); + fprintf(stderr, "Unsupported URI scheme `%s'\n", uri); return NULL; #ifdef __WIN32__ } else if (!strncmp((const char*)uri, "file:///", 8)) { @@ -211,13 +211,13 @@ sord_read_file(SordModel* model, { const uint8_t* const path = sord_file_uri_to_path(uri); if (!path) { - fprintf(stderr, "unable to read non-file URI `%s'\n", uri); + fprintf(stderr, "Unable to read non-file URI <%s>\n", uri); return false; } FILE* const fd = fopen((const char*)path, "r"); if (!fd) { - fprintf(stderr, "failed to open file `%s'\n", path); + fprintf(stderr, "Failed to open file %s\n", path); return false; } @@ -239,7 +239,7 @@ sord_read_file_handle(SordModel* model, SerdURI base_uri; if (!serd_uri_parse(base_uri_str, &base_uri)) { - fprintf(stderr, "invalid base URI `%s'\n", base_uri_str); + fprintf(stderr, "Invalid base URI <%s>\n", base_uri_str); } SerdEnv* env = serd_env_new(); @@ -278,7 +278,7 @@ sord_read_string(SordModel* model, SerdURI base_uri; if (!serd_uri_parse(base_uri_str, &base_uri)) { - fprintf(stderr, "invalid base URI `%s'\n", base_uri_str); + fprintf(stderr, "Invalid base URI <%s>\n", base_uri_str); } SerdEnv* env = serd_env_new(); @@ -315,9 +315,9 @@ sord_write_file(SordModel* model, return false; } - FILE* const fd = fopen((const char*)path, "w"); + FILE* const fd = fopen((const char*)path, "w"); if (!fd) { - fprintf(stderr, "failed to open file %s\n", path); + fprintf(stderr, "Failed to open file %s\n", path); return false; } @@ -380,7 +380,7 @@ make_writer(SerdEnv* env, uint8_t* base_uri_str = copy_string(base_uri_str_in, &base_uri_n_bytes); SerdURI base_uri; if (!serd_uri_parse(base_uri_str, &base_uri)) { - fprintf(stderr, "invalid base URI `%s'\n", base_uri_str); + fprintf(stderr, "Invalid base URI <%s>\n", base_uri_str); } SerdWriter* writer = serd_writer_new(SERD_TURTLE, |