FCL/sftools/dev/build: comparison imgtools/romtools/rofsbuild/rofsbuild.cpp

equal deleted inserted replaced

-:7b7f0409fc00
+:e5a58c351011
 bool gCleanCache = false;
 bool gNoCache = false;
 TBool gIsOBYUTF8 = EFalse;
 TBool gKeepGoing = EFalse;
 void PrintVersion() {
-	printf("\nROFSBUILD - Rofs/Datadrive image builder");
+	Print(EAlways,"\nROFSBUILD - Rofs/Datadrive image builder");
-	printf(" V%d.%d.%d\n", RofsbuildMajorVersion, RofsbuildMinorVersion, RofsbuildPatchVersion);
+	Print(EAlways, " V%d.%d.%d\n", RofsbuildMajorVersion, RofsbuildMinorVersion, RofsbuildPatchVersion);
-	printf("%s\n\n", "Copyright (c) 1996-2010 Nokia Corporation.");
+	Print(EAlways, "Copyright (c) 1996-2010 Nokia Corporation.");
 }
 char HelpText[] =
 	"Syntax: ROFSBUILD [options] obeyfilename(Rofs)\n"
 	"Option: -v verbose,  -?,  -s[log|screen|both] size summary\n"
 				if(argv[i][5]) {
 					gSmrImage = ETrue;
 					gSmrFileName.assign(&argv[i][5]);
 				}
 				else {
-					printf ("ERROR: SMR obey file is missing\n");
+					Print (EError, "SMR obey file is missing\n");
 				}
 			} else if (stricmp(argv[i], "-K") == 0) {
 				gKeepGoing = ETrue;
 			}else if (stricmp(argv[i], "-SYMBOLS") == 0) {
 				gGenSymbols = ETrue;
 			else if(strnicmp(argv[i], "-OBY-CHARSET=", 13) == 0)
 			{
 				if((stricmp(&argv[i][13], "UTF8")==0) || (stricmp(&argv[i][13], "UTF-8")==0))
 					gIsOBYUTF8 = ETrue;
 				else
-					printf("ERROR: Invalid encoding %s, default system internal encoding will be used.\n", &argv[i][13]);
+					Print(EError, "Invalid encoding %s, default system internal encoding will be used.\n", &argv[i][13]);
 			}
 			else if (stricmp(argv[i], "-UNCOMPRESS") == 0) {
 				gCompress = ECompressionUncompress;
 			}
 			else if( stricmp(argv[i], "-COMPRESSIONMETHOD") == 0 ) {
 				// next argument should a be method
 				if( (i+1) >= argc || argv[i+1][0] == '-') {
-					printf("ERROR: Missing compression method! Set it to default (no compression)!");
+					Print (EError, "Missing compression method! Set it to default (no compression)!");
 					gCompressionMethod = 0;
 				}
 				else {
 					i++;
 					if( stricmp(argv[i], "NONE") == 0) {
 					else if( stricmp(argv[i], "BYTEPAIR") == 0) {
 						gCompress = ECompressionCompress;
 						gCompressionMethod = KUidCompressionBytePair;
 					}
 					else {
-						printf("ERROR: Unknown compression method! Set it to default (no compression)!");
+						Print (EError, "Unknown compression method! Set it to default (no compression)!");
 						gCompress = ECompressionUnknown;
 						gCompressionMethod = 0;
 					}
 				}
 			else if (stricmp(argv[i], "-COREIMAGE") == 0) {
 				gUseCoreImage = ETrue;
 				// next argument should be image filename
 				if ((i+1 >= argc) || argv[i+1][0] == '-')
-					printf("ERROR: Missing image file name");
+					Print (EError, "Missing image file name");
 				else {
 					i++;
 					gImageFilename.assign(argv[i]);
 				}
 			}
 				if(argv[i][11])	{
 					gDriveImage = ETrue;
 					gDriveFilename.assign(&argv[i][11]);
 				}
 				else {
-					printf("ERROR: Drive obey file is missing\n");
+					Print (EError, "Drive obey file is missing\n");
 				}
 			}
 			else if (argv[i][1] == '?') {
 				reallyHelp = ETrue;
 			}
 				gEnableStdPathWarning = ETrue;
 			}
 			else if( stricmp(argv[i], "-LOGLEVEL") == 0) {
 				// next argument should a be loglevel
 				if( (i+1) >= argc || argv[i+1][0] == '-') {
-					printf ("ERROR: Missing loglevel!");
+					Print (EError, "Missing loglevel!");
 					gLogLevel = DEFAULT_LOG_LEVEL;
 				}
 				else {
 					i++;
 					if (strcmp(argv[i], "2") == 0)
 					if (strcmp(argv[i], "1") == 0)
 						gLogLevel = LOG_LEVEL_FILE_DETAILS;
 					else if (strcmp(argv[i], "0") == 0)
 						gLogLevel = DEFAULT_LOG_LEVEL;
 					else
-						printf("ERROR: Only loglevel 0, 1 or 2 is allowed!");
+						Print(EError, "Only loglevel 0, 1 or 2 is allowed!");
 				}
 			}
 			else if( stricmp(argv[i], "-LOGLEVEL2") == 0)
 				gLogLevel = (LOG_LEVEL_FILE_DETAILS | LOG_LEVEL_FILE_ATTRIBUTES);
 			else if( stricmp(argv[i], "-LOGLEVEL1") == 0)
 			else if (strnicmp(argv[i], "-loginput=", 10) == 0) {
 				loginput = argv[i] + 10;
 			}
 			else {
 #ifdef WIN32
-				printf ("WARNING: Unrecognised option %s\n",argv[i]);
+				Print (EWarning, "Unrecognised option %s\n",argv[i]);
 #else
 				if(0 == access(argv[i],R_OK)){
 					filename.assign(argv[i]);
 				}
 				else {
-					printf("WARNING: Unrecognised option %s\n",argv[i]);
+					Print (EWarning, "Unrecognised option %s\n",argv[i]);
 				}
 #endif
 			}
 		}
 			if (reallyHelp) {
 				ObeyFileReader::KeywordHelp();
 				Print (EAlways, ReallyHelpText);
 			}
 			else if (filename.empty()){
-				printf("WARNING: Obey filename is missing\n");
+				Print(EAlways, "Obey filename is missing\n");
 			}
 	}
 }
 /**
 #else
 	char* pCPUNum = getenv ("NUMBER_OF_PROCESSORS");
 	if (pCPUNum != NULL)
 		gCPUNum = atoi(pCPUNum);
 #endif
-	if(gCPUNum > MAXIMUM_THREADS)
+	if(gCPUNum > MAXIMUM_THREADS >> 1)
-		gCPUNum = MAXIMUM_THREADS;
+		gCPUNum = MAXIMUM_THREADS >> 1;
 	PrintVersion();
 	processCommandLine(argc, argv);
 	if(gThreadNum == 0) {
 		if(gCPUNum > 0) {
 			printf("The double number of processors (%d) is used as the number of concurrent jobs.\n", gCPUNum * 2);

changeset 714	e5a58c351011
parent 708	0757c2976f96