Commit 19f50be4 authored by Mathieu Valois's avatar Mathieu Valois
Browse files

factorize

parent fd33693c

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ include_directories(include) 
set(EXECUTABLE_OUTPUT_PATH bin/${CMAKE_BUILD_TYPE})



# Option du compilateur pour supporter C 2011.

set(CMAKE_CXX_FLAGS "-pedantic -Wall -std=c++11 -Wextra -O3")

set(CMAKE_CXX_FLAGS "-pedantic -Wall -std=c++11 -Wextra -g")

set(CMAKE_LD_FLAGS "-lpthread")



add_executable(cppack src/core/statsgen.cpp src/cli/main.cpp)

include/statsgen.h

+4 −2
Original line number Diff line number Diff line
@@ -197,17 +197,19 @@ public: 
	 */

	inline void enableDebug() { debug_enabled = true; }





	void message(const char* messages...) const;

	/**

	 * @brief print the warning message

	 * @param message: the warning message

	 */

	void warn(const char* messages...);

	void warn(const char* messages...) const ;



	/**

	 * @brief print the debug message if debug enabled

	 * @param message: the debug message

	 * */

	void debug(const char* messages...);

	void debug(const char* messages...) const;



	/**

	 * @brief Calculate all statistics for a database

src/core/statsgen.cpp

+9 −17
Original line number Diff line number Diff line
@@ -35,10 +35,9 @@ Statsgen::Statsgen(const std::string& name) { 
	}

}



void Statsgen::warn(const char* messages...){

void Statsgen::message(const char* messages...) const {

	va_list args;

	va_start(args, messages);

	cerr << "[Warning]";

	while (*messages != '\0'){

			cerr << " ";

			if (*messages == 'd') {
@@ -49,27 +48,20 @@ void Statsgen::warn(const char* messages...){ 
			}

			messages++;

	}

	cerr << endl;

	va_end(args);

}



void Statsgen::debug(const char* messages...){

void Statsgen::warn(const char* messages...) const{

	cerr << "[Warning]";

	message(messages);

	cerr << endl;

}



void Statsgen::debug(const char* messages...) const {

	if (!debug_enabled) return;

	va_list args;

	va_start(args, messages);

	cerr << "[Debug]";

	while (*messages != '\0'){

			cerr << " ";

			if (*messages == 'd') {

				cerr << va_arg(args, int);

			}

			else{

				cerr << va_arg(args, char*);

			}

			messages++;

	}

	message(messages);

	cerr << endl;

	va_end(args);

}