diff options
Diffstat (limited to 'src/console/dlt-convert.c')
| -rw-r--r-- | src/console/dlt-convert.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/src/console/dlt-convert.c b/src/console/dlt-convert.c index b82c104..8c72b60 100644 --- a/src/console/dlt-convert.c +++ b/src/console/dlt-convert.c @@ -126,17 +126,6 @@ void usage() printf(" -t Handling input compressed files (tar.gz)\n"); } -char *get_filename_ext(const char *filename) -{ - if (filename == NULL) - fprintf(stderr, "ERROR: %s: invalid arguments\n", __FUNCTION__); - - char *dot = strrchr(filename, '.'); - if(!dot || dot == filename) - return ""; - return dot + 1; -} - void empty_dir(const char *dir) { struct dirent **files = { 0 }; @@ -420,6 +409,7 @@ int main(int argc, char *argv[]) if (ovalue) close(ohandle); + dlt_file_free(&file, vflag); return -1; } @@ -428,35 +418,42 @@ int main(int argc, char *argv[]) if (ovalue) close(ohandle); + dlt_file_free(&file, vflag); return -1; } for (num = begin; num <= end; num++) { - dlt_file_message(&file, num, vflag); + if (dlt_file_message(&file, num, vflag) < DLT_RETURN_OK) + continue; if (xflag) { printf("%d ", num); - dlt_message_print_hex(&(file.msg), text, DLT_CONVERT_TEXTBUFSIZE, vflag); + if (dlt_message_print_hex(&(file.msg), text, DLT_CONVERT_TEXTBUFSIZE, vflag) < DLT_RETURN_OK) + continue; } else if (aflag) { printf("%d ", num); - dlt_message_header(&(file.msg), text, DLT_CONVERT_TEXTBUFSIZE, vflag); + if (dlt_message_header(&(file.msg), text, DLT_CONVERT_TEXTBUFSIZE, vflag) < DLT_RETURN_OK) + continue; printf("%s ", text); - dlt_message_payload(&file.msg, text, DLT_CONVERT_TEXTBUFSIZE, DLT_OUTPUT_ASCII, vflag); + if (dlt_message_payload(&file.msg, text, DLT_CONVERT_TEXTBUFSIZE, DLT_OUTPUT_ASCII, vflag) < DLT_RETURN_OK) + continue; printf("[%s]\n", text); } else if (mflag) { printf("%d ", num); - dlt_message_print_mixed_plain(&(file.msg), text, DLT_CONVERT_TEXTBUFSIZE, vflag); + if (dlt_message_print_mixed_plain(&(file.msg), text, DLT_CONVERT_TEXTBUFSIZE, vflag) < DLT_RETURN_OK) + continue; } else if (sflag) { printf("%d ", num); - dlt_message_header(&(file.msg), text, DLT_CONVERT_TEXTBUFSIZE, vflag); + if (dlt_message_header(&(file.msg), text, DLT_CONVERT_TEXTBUFSIZE, vflag) < DLT_RETURN_OK) + continue; printf("%s \n", text); } |