guohui 1 år sedan
förälder
incheckning
ce9ef80a33
1 ändrade filer med 8 tillägg och 8 borttagningar
  1. 8 8
      tools/mb/mb.cpp

+ 8 - 8
tools/mb/mb.cpp

@@ -272,7 +272,7 @@ static int file_read(const TCHAR* path, data_t *data)
 
 	hFile = CreateFile(path,			//name
 		GENERIC_READ,                   //以读方式打开
-		FILE_SHARE_READ,               //可共享读
+		FILE_SHARE_READ,                //可共享读
 		NULL,                           //默认安全设置
 		OPEN_EXISTING,                   //只打开已经存在的文件
 		FILE_ATTRIBUTE_NORMAL,           //常规文件属性
@@ -290,12 +290,12 @@ static int file_read(const TCHAR* path, data_t *data)
 
 	if(data->data==NULL) {
 		data->data = (char*)malloc(flen);
-		data->dlen = flen;
-	}
-	if (data->data == NULL) {
-		printf("___ data->data is NULL\n");
-		goto quit;
+		if (data->data == NULL) {
+			printf("___ data->data is NULL\n");
+			goto quit;
+		}
 	}
+	data->dlen = flen;
 	
 	r = ReadFile(hFile, data->data, data->dlen, &rlen, NULL);
 	if (r==FALSE) {
@@ -362,10 +362,10 @@ int main(char argc, char *argv[])
 	md5_t md5;
 
 	if (argc==2) {
-		printf("make to a upgrade file\n");
+		printf("make a upgrade file\n");
 	}
 	else if(argc == 3){
-		printf("make 2 files to a single bin\n");
+		printf("make a single bin\n");
 		make_single_bin = 1;
 	}
 	else {