X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Fcommon%2Feal_common_hexdump.c;h=6135133fae47129e8094fb2648d1c3f8ef088261;hb=92d94d3744d7760d8d5e490be810612cf4a9cfb0;hp=57dd2394613a9c5da8c4024f6f703f8ffb986be1;hpb=1c1d4d7a923d4804f1926fc5264f9ecdd8977b04;p=dpdk.git diff --git a/lib/librte_eal/common/eal_common_hexdump.c b/lib/librte_eal/common/eal_common_hexdump.c old mode 100755 new mode 100644 index 57dd239461..6135133fae --- a/lib/librte_eal/common/eal_common_hexdump.c +++ b/lib/librte_eal/common/eal_common_hexdump.c @@ -1,13 +1,13 @@ /*- * BSD LICENSE - * - * Copyright(c) 2010-2013 Intel Corporation. All rights reserved. + * + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright @@ -17,7 +17,7 @@ * * Neither the name of Intel Corporation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -53,30 +53,30 @@ */ void -rte_hexdump(const char * title, const void * buf, unsigned int len) +rte_hexdump(FILE *f, const char * title, const void * buf, unsigned int len) { unsigned int i, out, ofs; const unsigned char *data = buf; char line[LINE_LEN]; /* space needed 8+16*3+3+16 == 75 */ - printf("%s at [%p], len=%u\n", (title)? title : " Dump data", data, len); + fprintf(f, "%s at [%p], len=%u\n", (title)? title : " Dump data", data, len); ofs = 0; while (ofs < len) { /* format the line in the buffer, then use printf to output to screen */ - out = rte_snprintf(line, LINE_LEN, "%08X:", ofs); + out = snprintf(line, LINE_LEN, "%08X:", ofs); for (i = 0; ((ofs + i) < len) && (i < 16); i++) - out += rte_snprintf(line+out, LINE_LEN - out, " %02X", (data[ofs+i] & 0xff)); + out += snprintf(line+out, LINE_LEN - out, " %02X", (data[ofs+i] & 0xff)); for(; i <= 16; i++) - out += rte_snprintf(line+out, LINE_LEN - out, " | "); + out += snprintf(line+out, LINE_LEN - out, " | "); for(i = 0; (ofs < len) && (i < 16); i++, ofs++) { unsigned char c = data[ofs]; if ( (c < ' ') || (c > '~')) c = '.'; - out += rte_snprintf(line+out, LINE_LEN - out, "%c", c); + out += snprintf(line+out, LINE_LEN - out, "%c", c); } - printf("%s\n", line); + fprintf(f, "%s\n", line); } - fflush(stdout); + fflush(f); } /**************************************************************************//** @@ -92,30 +92,30 @@ rte_hexdump(const char * title, const void * buf, unsigned int len) */ void -rte_memdump(const char * title, const void * buf, unsigned int len) +rte_memdump(FILE *f, const char * title, const void * buf, unsigned int len) { unsigned int i, out; const unsigned char *data = buf; char line[LINE_LEN]; if ( title ) - printf("%s: ", title); + fprintf(f, "%s: ", title); line[0] = '\0'; for (i = 0, out = 0; i < len; i++) { // Make sure we do not overrun the line buffer length. if ( out >= (LINE_LEN - 4) ) { - printf("%s", line); + fprintf(f, "%s", line); out = 0; line[out] = '\0'; } - out += rte_snprintf(line+out, LINE_LEN - out, "%02x%s", + out += snprintf(line+out, LINE_LEN - out, "%02x%s", (data[i] & 0xff), ((i+1) < len)? ":" : ""); } if ( out > 0 ) - printf("%s", line); - printf("\n"); + fprintf(f, "%s", line); + fprintf(f, "\n"); - fflush(stdout); + fflush(f); }