Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv14312/src/blob
Modified Files:
main.c
Log Message:
Remove strncmp().
This will force you to think before you compare two strings, but I consider
that a Good Thing [tm].
All other changes are trivial.
Index: main.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- main.c 2001/12/16 18:12:33 1.15
+++ main.c 2001/12/19 19:03:45 1.16
@@ -364,33 +364,33 @@
if(argc < 2)
return -ENOPARAMS;
- if(strcmp(argv[1], "1200") == 0) {
+ if(strncmp(argv[1], "1200", 4) == 0) {
blob_status.downloadSpeed = baud1k2;
- } else if(strcmp(argv[1], "1k2") == 0) {
+ } else if(strncmp(argv[1], "1k2", 3) == 0) {
blob_status.downloadSpeed = baud1k2;
- } else if(strcmp(argv[1], "9600") == 0) {
+ } else if(strncmp(argv[1], "9600", 4) == 0) {
blob_status.downloadSpeed = baud9k6;
- } else if(strcmp(argv[1], "9k6") == 0) {
+ } else if(strncmp(argv[1], "9k6", 3) == 0) {
blob_status.downloadSpeed = baud9k6;
- } else if(strcmp(argv[1], "19200") == 0) {
+ } else if(strncmp(argv[1], "19200", 5) == 0) {
blob_status.downloadSpeed = baud19k2;
- } else if(strcmp(argv[1], "19k2") == 0) {
+ } else if(strncmp(argv[1], "19k2", 4) == 0) {
blob_status.downloadSpeed = baud19k2;
- } else if(strcmp(argv[1], "38400") == 0) {
+ } else if(strncmp(argv[1], "38400", 5) == 0) {
blob_status.downloadSpeed = baud38k4;
- } else if(strcmp(argv[1], "38k4") == 0) {
+ } else if(strncmp(argv[1], "38k4",4 ) == 0) {
blob_status.downloadSpeed = baud38k4;
- } else if(strcmp(argv[1], "57600") == 0) {
+ } else if(strncmp(argv[1], "57600", 5) == 0) {
blob_status.downloadSpeed = baud57k6;
- } else if(strcmp(argv[1], "57k6") == 0) {
+ } else if(strncmp(argv[1], "57k6", 4) == 0) {
blob_status.downloadSpeed = baud57k6;
- } else if(strcmp(argv[1], "115200") == 0) {
+ } else if(strncmp(argv[1], "115200", 6) == 0) {
blob_status.downloadSpeed = baud115k2;
- } else if(strcmp(argv[1], "115k2") == 0) {
+ } else if(strncmp(argv[1], "115k2", 5) == 0) {
blob_status.downloadSpeed = baud115k2;
- } else if(strcmp(argv[1], "230400") == 0) {
+ } else if(strncmp(argv[1], "230400", 6) == 0) {
blob_status.downloadSpeed = baud230k4;
- } else if(strcmp(argv[1], "230k4") == 0) {
+ } else if(strncmp(argv[1], "230k4", 5) == 0) {
blob_status.downloadSpeed = baud230k4;
} else {
return -EINVAL;
@@ -498,7 +498,7 @@
u32 *src = 0;
int numWords;
- if(strcmp(what, "blob") == 0) {
+ if(strncmp(what, "blob", 4) == 0) {
dst = (u32 *)BLOB_RAM_BASE;
src = (u32 *)BLOB_FLASH_BASE;
numWords = BLOB_FLASH_LEN / 4;
@@ -506,7 +506,7 @@
blob_status.blobType = fromFlash;
SerialOutputString("Loading blob from flash ");
#ifdef PARAM_START
- } else if(strcmp(what, "param") == 0) {
+ } else if(strncmp(what, "param", 5) == 0) {
dst = (u32 *)PARAM_RAM_BASE;
src = (u32 *)PARAM_FLASH_BASE;
numWords = PARAM_FLASH_LEN / 4;
@@ -514,14 +514,14 @@
blob_status.paramType = fromFlash;
SerialOutputString("Loading paramater block from flash ");
#endif
- } else if(strcmp(what, "kernel") == 0) {
+ } else if(strncmp(what, "kernel", 6) == 0) {
dst = (u32 *)KERNEL_RAM_BASE;
src = (u32 *)KERNEL_FLASH_BASE;
numWords = KERNEL_FLASH_LEN / 4;
blob_status.kernelSize = 0;
blob_status.kernelType = fromFlash;
SerialOutputString("Loading kernel from flash ");
- } else if(strcmp(what, "ramdisk") == 0) {
+ } else if(strncmp(what, "ramdisk", 7) == 0) {
dst = (u32 *)RAMDISK_RAM_BASE;
src = (u32 *)RAMDISK_FLASH_BASE;
numWords = RAMDISK_FLASH_LEN / 4;
|
