From: hadaq Date: Tue, 8 Feb 2011 16:13:46 +0000 (+0000) Subject: yes question X-Git-Tag: v6.0~161 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=96b4e10b54116ce732bd0277e6dd8faae6dde4a4;p=trbnettools.git yes question --- diff --git a/libtrbnet/trbflash.c b/libtrbnet/trbflash.c index 9874dee..5917452 100644 --- a/libtrbnet/trbflash.c +++ b/libtrbnet/trbflash.c @@ -96,7 +96,7 @@ static const char FlashTypeStr[16][32] = { static FlashType flashType = FLASH_INVALID; static uint32_t manId = 0; -static const char trbflash_version[] = "$Revision: 2.27 $"; +static const char trbflash_version[] = "$Revision: 2.28 $"; static uint32_t mdcFlashSelect = 1; @@ -625,13 +625,13 @@ static int programImageBuffer(uint16_t trb_address, char c; if ((flashType == FLASH_MDC_OEP_V2) || (flashType == FLASH_MDC_OEP_V3)) { if (mdcFlashSelect == 0) { - fprintf(stdout, + fprintf(stderr, "You decided to reprogram the FlashRom(s) #0 of " "MDC_OEP, the so called 'GoldenImage'. " "Do you really know what you're about to do [N,y]: "); } } else { - fprintf(stdout, + fprintf(stderr, "You decided to reprogram the FlashRom(s) of " "%s, are you sure [N,y]: ", FlashTypeStr[flashType]); } @@ -975,7 +975,7 @@ static int prepareImageBuffer() /* Overwrite Header with 0xff */ end = 0; for (i = 0; i < 2 * PAGE_SIZE; i++) { - if (strncmp((char *)(imageBuffer + i), "Bitstream CRC: 0x", 17) == 0) { + if (memcmp(imageBuffer + i, "Bitstream CRC: 0x", 17) == 0) { end = i + 22; break; }