From 362259ad3e1d969d2b515248ea6bb050808a222c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 14 Nov 2005 18:58:30 +0000 Subject: fixed a million gcc4 warnings git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7872 a1c6a512-1295-4272-9138-f99709370657 --- tools/scramble.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/scramble.c b/tools/scramble.c index ecb198b0f4..9d0a8d415a 100644 --- a/tools/scramble.c +++ b/tools/scramble.c @@ -19,7 +19,7 @@ #include #include - +#include #include "iriver.h" enum @@ -81,9 +81,9 @@ int main (int argc, char** argv) unsigned short crc=0; unsigned long chksum=0; /* 32 bit checksum */ unsigned char header[24]; - unsigned char *iname = argv[1]; - unsigned char *oname = argv[2]; - unsigned char *xorstring; + char *iname = argv[1]; + char *oname = argv[2]; + char *xorstring; int headerlen = 6; FILE* file; int version; @@ -320,7 +320,7 @@ int main (int argc, char** argv) #define MY_FIRMWARE_TYPE "Rockbox" #define MY_HEADER_VERSION 1 default: - strncpy(header,MY_FIRMWARE_TYPE,9); + strncpy((char *)header, MY_FIRMWARE_TYPE,9); header[9]='\0'; /*shouldn't have to, but to be SURE */ header[10]=MY_HEADER_VERSION&0xFF; header[11]=(crc>>8)&0xFF; -- cgit v1.2.3