tools/dump-funcs: make dumpstruct less generic

This commit removes the "dest" argument to dumpstruct(), which now uses printf() and not fprintf(dest,). I plan to use these functions withing PPSi itself if the "frames" diagnostic level is 2, and I'd better avoid to hack around fprintf. ptpdump is not changed, as it already used dumpstruct() with stdout as destination. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

tools/dump-funcs: make dumpstruct less generic
This commit removes the "dest" argument to dumpstruct(), which now uses printf() and not fprintf(dest,). I plan to use these functions withing PPSi itself if the "frames" diagnostic level is 2, and I'd better avoid to hack around fprintf. ptpdump is not changed, as it already used dumpstruct() with stdout as destination. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
9062861f · Alessandro Rubini · b31bb242 · 9062861f · 9062861f
Commit 9062861f authored Mar 12, 2013 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

dump-funcs.c tools/dump-funcs.c +8 -8

ptpdump.h tools/ptpdump.h +1 -1

No files found.
--- a/tools/dump-funcs.c
+++ b/tools/dump-funcs.c
@@ -10,21 +10,21 @@
 #include "decent_types.h"
 #include "ptpdump.h"

-int dumpstruct(FILE *dest, char *prefix, char *name, void *ptr, int size)
+int dumpstruct(char *prefix, char *name, void *ptr, int size)
 {
 	int ret, i;
 	unsigned char *p = ptr;

-	ret = fprintf(dest, "%s%s (size %i)\n", prefix, name, size);
+	ret = printf("%s%s (size %i)\n", prefix, name, size);
 	for (i = 0; i < size; ) {
 		if ((i & 0xf) == 0)
-			ret += fprintf(dest, "%s", prefix);
-		ret += fprintf(dest, "%02x", p[i]);
+			ret += printf("%s", prefix);
+		ret += printf("%02x", p[i]);
 		i++;
-		ret += fprintf(dest, i & 3 ? " " : i & 0xf ? "  " : "\n");
+		ret += printf(i & 3 ? " " : i & 0xf ? "  " : "\n");
 	}
 	if (i & 0xf)
-		ret += fprintf(dest, "\n");
+		ret += printf("\n");
 	return ret;
 }

@@ -147,7 +147,7 @@ int dump_tlv(struct ptp_tlv *tlv, int totallen)
 	/* later:  if (memcmp(tlv->oui, "\x08\x00\x30", 3)) ... */

 	/* Now dump non-wr tlv in binary, count only payload */
-	dumpstruct(stdout, "TLV: ", "tlv-content", tlv->data,
+	dumpstruct("TLV: ", "tlv-content", tlv->data,
 		   explen - sizeof(*tlv));
 	return explen;
 }
@@ -235,7 +235,7 @@ void dump_payload(void *pl, int len)
 	}

 	/* Finally, binary dump of it all */
-	dumpstruct(stdout, "DUMP: ", "payload", pl, len);
+	dumpstruct("DUMP: ", "payload", pl, len);
 }

 int dump_udppkt(void *buf, int len)

--- a/tools/ptpdump.h
+++ b/tools/ptpdump.h

-int dumpstruct(FILE *dest, char *prefix, char *name, void *ptr, int size);
+int dumpstruct(char *prefix, char *name, void *ptr, int size);
 void dump_eth(struct ethhdr *eth);
 void dump_ip(struct iphdr *ip);
 void dump_udp(struct udphdr *udp);