[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH 2/3] nbd-trdump, nbd-trplay: printf improvements/corrections



From: Manfred Spraul <manfred.spraul@de.bosch.com>

Two improvements to the printf output:
- Correct an incorrect printout from nbd-trplay:
  When open() on the the log file fails, the tool incorrectly warns
  that the disk image is inaccessible.

- Both nbd-trdump and nbd-trplay: Add a warning if unknown options
  are encountered.

Signed-off-by: Manfred Spraul <manfred.spraul@de.bosch.com>
---
 nbd-trdump.c | 4 ++++
 nbd-trplay.c | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nbd-trdump.c b/nbd-trdump.c
index d914e63..c7c5322 100644
--- a/nbd-trdump.c
+++ b/nbd-trdump.c
@@ -130,14 +130,18 @@ int main(int argc, char**argv) {
 					break;
 				default:
 					printf("TRACE_OPTION ? Unknown type\n");
+					printf(" Further log file evaluation may be incorrect, please upgrade nbd-trdump.\n");
+
 				}
 			} else {
 				printf("TRACE_OPTION ? Unknown FROM_MAGIC\n");
+				printf(" Further log file evaluation may be incorrect, please upgrade nbd-trdump.\n");
 			}
 			break;
 
 		default:
 			printf("? Unknown transaction type %08x\n",magic);
+			printf(" Further log file evaluation may be incorrect, please upgrade nbd-trdump.\n");
 			break;
 		}
 		
diff --git a/nbd-trplay.c b/nbd-trplay.c
index 143d8cb..f98b7df 100644
--- a/nbd-trplay.c
+++ b/nbd-trplay.c
@@ -221,9 +221,11 @@ int main_loop(int logfd, int imagefd) {
 					break;
 				default:
 					printf("TRACE_OPTION ? Unknown type\n");
+					printf(" Further log file evaluation may be incorrect, please upgrade nbd-trplay.\n");
 				}
 			} else {
 				printf("TRACE_OPTION ? Unknown FROM_MAGIC\n");
+				printf(" Further log file evaluation may be incorrect, please upgrade nbd-trplay.\n");
 			}
 			break;
 
@@ -301,7 +303,7 @@ int main(int argc, char **argv) {
 		case 'l':
 			logfd = open(optarg, O_RDONLY, 0);
 			if (logfd == -1) {
-				printf("  Opening disk image failed, errno %d.", errno);
+				printf("  Opening log file failed, errno %d.", errno);
 				return 1;
 			}
 			break;
-- 
2.35.1


Reply to: