Commit 1536bce2 authored by Mathieu Valois's avatar Mathieu Valois
Browse files

merge clean_code

parents 77253b07 411d76a2

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")

set(CMAKE_LD_FLAGS "-lpthread")



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

include/statsgen.h

+0 −14
Original line number Diff line number Diff line
@@ -198,20 +198,6 @@ public: 
	inline void enableDebug() { debug_enabled = true; }





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



	/**

	 * @brief print the warning message

	 * @param message: the warning message

	 */

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



	/**

	 * @brief print the debug message if debug enabled

	 * @param message: the debug message

	 * */

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



	/**

	 * @brief Calculate all statistics for a database

	 * @return 0 if error, 1 if success

src/core/statsgen.cpp

+3 −30
Original line number Diff line number Diff line
@@ -28,41 +28,13 @@ using namespace std; 
Statsgen::Statsgen(const std::string& name) {

	if (name == "-"){

		is_stdin = true;

		warn("reading from stdin enabled, loading the whole list in memory");

		cerr << "[WARNING]" << " reading from stdin enabled, loading the whole list in memory" << endl;

	}

	else {

		filename = name;

	}

}



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

	va_list args;

	va_start(args, messages);

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

		cerr << " ";

		if (*messages == 'd') {

			cerr << va_arg(args, int);

		}

		else{

			cerr << va_arg(args, char*);

		}

		messages++;

	}

	va_end(args);

}



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

	cerr << "[Warning]";

	message(messages);

	cerr << endl;

}



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

	cerr << "[Debug]";

	message(messages);

	cerr << endl;

}





void Statsgen::askSecurityRules() {

	wcout << "\nMinimal length of a password:" << endl;
@@ -146,7 +118,8 @@ int Statsgen::generate_stats() { 
		td[i].sr.minLower = minLower;

		td[i].sr.minUpper = minUpper;



		debug("Thread", td[i].thread_id, "analyse :", td[i].lineBegin, " -->", td[i].lineEnd);

		if(debug_enabled)

			cerr << "[DEBUG]" << "Thread" << td[i].thread_id << "analyse :" << td[i].lineBegin << " -->" << td[i].lineEnd << endl;

		// We use std::queue if input is from stdin

		if (is_stdin) {

			rc = pthread_create(&threads[i], NULL, generate_stats_thread_queue, (void *)&td[i] );