MySmartUSB-MK3-Interface

commit 9edac9b7835ed7b1cd5f7d7f1c7eeb8c78df4768
parent 5e2d2324b03141a907f2895f9f3a073e89e27d4a
Author: Dominik Schmidt <das1993@hotmail.com>
Date:   Thu, 13 Dec 2012 22:01:11 +0100

Verbosity function added

Diffstat:
src/engine.c
 | 
2
+-
src/log.c
 | 
3
++-
src/option.c
 | 
12
++++++++++++

3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/engine.c b/src/engine.c
@@ -59,7 +59,7 @@ int engine_run(void){
 }
 
 int engine_deinit(void){
-	if(configuration.print_usage){
+	if(configuration.print_usage||1){
 		print_usage(stderr);
 	}
 	return 0;
diff --git a/src/log.c b/src/log.c
@@ -16,7 +16,7 @@
 char LOG_LEVEL_names[LOG_LEVEL_COUNT][8]={"DEBUG","INFO", "SUCCESS","WARNING","ERROR","FATAL"};
 void log_string(char *str, unsigned short int level){
 	FILE *stream;
-	if(level>=LOG_LEVEL_WARNING){
+	if(level>=LOG_LEVEL_WARNING&&level!=LOG_LEVEL_COUNT&&level!=LOG_LEVEL_SUCCESS){
 		stream=stderr;
 	}
 	else{
@@ -57,6 +57,7 @@ void do_log(char *src, char *msg, unsigned short int level, unsigned short int t
 		sprintf(str,"%s[%s]: %s (%s)",LOG_LEVEL_names[level],src,msg,strerror(error));
 	}
 	else if(type==LOG_TYPE_RESULT){
+		level=LOG_LEVEL_COUNT;
 		sprintf(str,"%s",msg);
 	}
 	else{
diff --git a/src/option.c b/src/option.c
@@ -44,6 +44,18 @@ int parseArguments(int argc, char **argv, struct conf *config){
 			}
 			continue;
 		}
+		if(strcmp(argv[i],"-q")==0){
+			if(config->log_level<LOG_LEVEL_FATAL){
+				config->log_level++;
+			}
+			continue;
+		}
+		if(strcmp(argv[i],"-v")==0){
+			if(config->log_level>0){
+				config->log_level--;
+			}
+			continue;
+		}
 	}
 	optionAddCommand(config, NULL, NULL);
 	return 0;