diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-06-26 22:55:16 +0900 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2012-06-27 13:15:59 +0200 |
| commit | 3e6dfe138a959059ed3a7c69e27d99d192325fd2 (patch) | |
| tree | 649e0634a5da8abd75e1828e396f0412c5f9e3ca /src/tool_metalink.c | |
| parent | 7aa95afadd39867dd95fd4f3df316f7e7decac7a (diff) | |
Metalink: updated message format
Diffstat (limited to 'src/tool_metalink.c')
| -rw-r--r-- | src/tool_metalink.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/tool_metalink.c b/src/tool_metalink.c index 89a99d3ec..806574133 100644 --- a/src/tool_metalink.c +++ b/src/tool_metalink.c @@ -330,12 +330,10 @@ static int check_hash(const char *filename, digest_context *dctx; int check_ok; int fd; - fprintf(error, - "Metalink: Validating %s checksum (This may take some time)...\n", - digest_def->hash_name); + fprintf(error, "Metalink: validating (%s)...\n", filename); fd = open(filename, O_RDONLY); if(fd == -1) { - fprintf(error, "Metalink: Could not open file %s: %s\n", filename, + fprintf(error, "Metalink: validating (%s) FAILED (%s)\n", filename, strerror(errno)); return -1; } @@ -348,7 +346,7 @@ static int check_hash(const char *filename, break; } else if(len == -1) { - fprintf(error, "Metalink: Could not read file %s: %s\n", filename, + fprintf(error, "Metalink: validating (%s) FAILED (%s)\n", filename, strerror(errno)); Curl_digest_final(dctx, result); close(fd); @@ -361,9 +359,10 @@ static int check_hash(const char *filename, digest_def->dparams->digest_resultlen) == 0; /* sha*sum style verdict output */ if(check_ok) - fprintf(error, "Metalink: %s: OK\n", filename); + fprintf(error, "Metalink: validating (%s) OK\n", filename); else - fprintf(error, "Metalink: %s: FAILED\n", filename); + fprintf(error, "Metalink: validating (%s) FAILED (digest mismatch)\n", + filename); free(result); close(fd); @@ -469,7 +468,8 @@ static metalinkfile *new_metalinkfile(metalink_file_t *fileinfo) return f; } -int parse_metalink(struct Configurable *config, struct OutStruct *outs) +int parse_metalink(struct Configurable *config, struct OutStruct *outs, + const char *metalink_url) { metalink_error_t r; metalink_t* metalink; @@ -482,8 +482,9 @@ int parse_metalink(struct Configurable *config, struct OutStruct *outs) return -1; } if(metalink->files == NULL) { - fprintf(config->errors, - "\nMetalink: Metalink XML file does not contain any file.\n"); + fprintf(config->errors, "\nMetalink: parsing (%s) WARNING " + "(missing or invalid file name)\n", + metalink_url); metalink_delete(metalink); return 0; } @@ -491,9 +492,9 @@ int parse_metalink(struct Configurable *config, struct OutStruct *outs) struct getout *url; /* Skip an entry which has no resource. */ if(!(*files)->resources) { - fprintf(config->errors, - "\nMetalink: File %s does not have any resource.\n", - (*files)->name); + fprintf(config->errors, "\nMetalink: parsing (%s) WARNING " + "(missing or invalid resource)\n", + metalink_url, (*files)->name); continue; } if(config->url_get || @@ -558,7 +559,7 @@ size_t metalink_write_cb(void *buffer, size_t sz, size_t nmemb, if(rv == 0) return sz * nmemb; else { - warnf(config, "Metalink: Failed to parse Metalink XML file\n"); + fprintf(config->errors, "Metalink: parsing FAILED\n"); return failure; } } |