From 2442beb99eeab3144c2622cae1fc98b999f72108 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Mon, 14 Aug 2023 13:54:50 -0400 Subject: [PATCH] PR29108 / BZ2095359 tweak: stap_merge magic handling We don't bother do much error checking in this infrequently used tool, but gcc warnings require us to do some. --- staprun/stap_merge.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/staprun/stap_merge.c b/staprun/stap_merge.c index b210db663..388b14938 100644 --- a/staprun/stap_merge.c +++ b/staprun/stap_merge.c @@ -76,7 +76,8 @@ int main (int argc, char *argv[]) fprintf(stderr, "error opening file %s.\n", argv[optind - 1]); return -1; } - (void) fread(buf, 4, 1, fp[i]); // read & ignore magic word + if (fread(buf, 4, 1, fp[i]) != 1) // read magic word + fprintf(stderr, "warning: erro reading magic word\n"); if (fread (buf, TIMESTAMP_SIZE, 1, fp[i])) num[i] = *((int *)buf); else @@ -134,7 +135,8 @@ int main (int argc, char *argv[]) count = min; } - (void) fread(buf, 4, 1, fp[i]); // read & ignore magic word + if (fread(buf, 4, 1, fp[i]) != 1) // read magic word + fprintf(stderr, "warning: erro reading magic word\n"); if (fread (buf, TIMESTAMP_SIZE, 1, fp[j])) num[j] = *((int *)buf); else -- 2.43.5