From 4e64cab3c3f9e50c50bcc36882d4bda864b102d6 Mon Sep 17 00:00:00 2001 From: Martijn van Brummelen Date: Mon, 13 Feb 2017 13:40:00 +0100 Subject: [PATCH] use localtime instead of gmtime for logging --- COPYING => nwipe/COPYING | 0 Makefile.am => nwipe/Makefile.am | 0 README => nwipe/README | 0 README.md => nwipe/README.md | 0 configure.ac => nwipe/configure.ac | 0 init.sh => nwipe/init.sh | 0 {man => nwipe/man}/Makefile.am | 0 {man => nwipe/man}/nwipe.1 | 0 {src => nwipe/src}/Makefile.am | 0 {src => nwipe/src}/context.h | 0 {src => nwipe/src}/device.c | 1 - {src => nwipe/src}/device.h | 0 {src => nwipe/src}/gui.c | 0 {src => nwipe/src}/gui.h | 0 {src => nwipe/src}/isaac_rand.c | 0 {src => nwipe/src}/isaac_rand.h | 0 {src => nwipe/src}/isaac_standard.h | 0 {src => nwipe/src}/logging.c | 2 +- {src => nwipe/src}/logging.h | 0 {src => nwipe/src}/method.c | 0 {src => nwipe/src}/method.h | 0 {src => nwipe/src}/mt19937ar-cok.c | 0 {src => nwipe/src}/mt19937ar-cok.h | 0 {src => nwipe/src}/nwipe.c | 10 +++------- {src => nwipe/src}/nwipe.h | 0 {src => nwipe/src}/options.c | 0 {src => nwipe/src}/options.h | 0 {src => nwipe/src}/pass.c | 0 {src => nwipe/src}/pass.h | 0 {src => nwipe/src}/prng.c | 0 {src => nwipe/src}/prng.h | 0 {src => nwipe/src}/version.c | 16 ---------------- {src => nwipe/src}/version.h | 0 33 files changed, 4 insertions(+), 25 deletions(-) rename COPYING => nwipe/COPYING (100%) rename Makefile.am => nwipe/Makefile.am (100%) rename README => nwipe/README (100%) rename README.md => nwipe/README.md (100%) rename configure.ac => nwipe/configure.ac (100%) rename init.sh => nwipe/init.sh (100%) rename {man => nwipe/man}/Makefile.am (100%) rename {man => nwipe/man}/nwipe.1 (100%) rename {src => nwipe/src}/Makefile.am (100%) rename {src => nwipe/src}/context.h (100%) rename {src => nwipe/src}/device.c (99%) rename {src => nwipe/src}/device.h (100%) rename {src => nwipe/src}/gui.c (100%) rename {src => nwipe/src}/gui.h (100%) rename {src => nwipe/src}/isaac_rand.c (100%) rename {src => nwipe/src}/isaac_rand.h (100%) rename {src => nwipe/src}/isaac_standard.h (100%) rename {src => nwipe/src}/logging.c (99%) rename {src => nwipe/src}/logging.h (100%) rename {src => nwipe/src}/method.c (100%) rename {src => nwipe/src}/method.h (100%) rename {src => nwipe/src}/mt19937ar-cok.c (100%) rename {src => nwipe/src}/mt19937ar-cok.h (100%) rename {src => nwipe/src}/nwipe.c (99%) rename {src => nwipe/src}/nwipe.h (100%) rename {src => nwipe/src}/options.c (100%) rename {src => nwipe/src}/options.h (100%) rename {src => nwipe/src}/pass.c (100%) rename {src => nwipe/src}/pass.h (100%) rename {src => nwipe/src}/prng.c (100%) rename {src => nwipe/src}/prng.h (100%) rename {src => nwipe/src}/version.c (64%) rename {src => nwipe/src}/version.h (100%) diff --git a/COPYING b/nwipe/COPYING similarity index 100% rename from COPYING rename to nwipe/COPYING diff --git a/Makefile.am b/nwipe/Makefile.am similarity index 100% rename from Makefile.am rename to nwipe/Makefile.am diff --git a/README b/nwipe/README similarity index 100% rename from README rename to nwipe/README diff --git a/README.md b/nwipe/README.md similarity index 100% rename from README.md rename to nwipe/README.md diff --git a/configure.ac b/nwipe/configure.ac similarity index 100% rename from configure.ac rename to nwipe/configure.ac diff --git a/init.sh b/nwipe/init.sh similarity index 100% rename from init.sh rename to nwipe/init.sh diff --git a/man/Makefile.am b/nwipe/man/Makefile.am similarity index 100% rename from man/Makefile.am rename to nwipe/man/Makefile.am diff --git a/man/nwipe.1 b/nwipe/man/nwipe.1 similarity index 100% rename from man/nwipe.1 rename to nwipe/man/nwipe.1 diff --git a/src/Makefile.am b/nwipe/src/Makefile.am similarity index 100% rename from src/Makefile.am rename to nwipe/src/Makefile.am diff --git a/src/context.h b/nwipe/src/context.h similarity index 100% rename from src/context.h rename to nwipe/src/context.h diff --git a/src/device.c b/nwipe/src/device.c similarity index 99% rename from src/device.c rename to nwipe/src/device.c index b9c15ab..68ab49e 100644 --- a/src/device.c +++ b/nwipe/src/device.c @@ -27,7 +27,6 @@ #include "logging.h" #include -#include int check_device( nwipe_context_t*** c, PedDevice* dev, int dcount ); diff --git a/src/device.h b/nwipe/src/device.h similarity index 100% rename from src/device.h rename to nwipe/src/device.h diff --git a/src/gui.c b/nwipe/src/gui.c similarity index 100% rename from src/gui.c rename to nwipe/src/gui.c diff --git a/src/gui.h b/nwipe/src/gui.h similarity index 100% rename from src/gui.h rename to nwipe/src/gui.h diff --git a/src/isaac_rand.c b/nwipe/src/isaac_rand.c similarity index 100% rename from src/isaac_rand.c rename to nwipe/src/isaac_rand.c diff --git a/src/isaac_rand.h b/nwipe/src/isaac_rand.h similarity index 100% rename from src/isaac_rand.h rename to nwipe/src/isaac_rand.h diff --git a/src/isaac_standard.h b/nwipe/src/isaac_standard.h similarity index 100% rename from src/isaac_standard.h rename to nwipe/src/isaac_standard.h diff --git a/src/logging.c b/nwipe/src/logging.c similarity index 99% rename from src/logging.c rename to nwipe/src/logging.c index eba15e1..dbf82a4 100644 --- a/src/logging.c +++ b/nwipe/src/logging.c @@ -50,7 +50,7 @@ void nwipe_log( nwipe_log_t level, const char* format, ... ) /* Get the current time. */ t = time( NULL ); - p = gmtime( &t ); + p = localtime( &t ); pthread_mutex_lock( &mutex1 ); diff --git a/src/logging.h b/nwipe/src/logging.h similarity index 100% rename from src/logging.h rename to nwipe/src/logging.h diff --git a/src/method.c b/nwipe/src/method.c similarity index 100% rename from src/method.c rename to nwipe/src/method.c diff --git a/src/method.h b/nwipe/src/method.h similarity index 100% rename from src/method.h rename to nwipe/src/method.h diff --git a/src/mt19937ar-cok.c b/nwipe/src/mt19937ar-cok.c similarity index 100% rename from src/mt19937ar-cok.c rename to nwipe/src/mt19937ar-cok.c diff --git a/src/mt19937ar-cok.h b/nwipe/src/mt19937ar-cok.h similarity index 100% rename from src/mt19937ar-cok.h rename to nwipe/src/mt19937ar-cok.h diff --git a/src/nwipe.c b/nwipe/src/nwipe.c similarity index 99% rename from src/nwipe.c rename to nwipe/src/nwipe.c index b0e89f2..3ec8131 100644 --- a/src/nwipe.c +++ b/nwipe/src/nwipe.c @@ -23,6 +23,9 @@ #include #include +#include +#include +#include #include "nwipe.h" #include "context.h" @@ -34,13 +37,6 @@ #include "gui.h" -#include /* FIXME: Twice Included */ -#include -#include - -#include -#include - int main( int argc, char** argv ) { int nwipe_optind; /* The result of nwipe_options(). */ diff --git a/src/nwipe.h b/nwipe/src/nwipe.h similarity index 100% rename from src/nwipe.h rename to nwipe/src/nwipe.h diff --git a/src/options.c b/nwipe/src/options.c similarity index 100% rename from src/options.c rename to nwipe/src/options.c diff --git a/src/options.h b/nwipe/src/options.h similarity index 100% rename from src/options.h rename to nwipe/src/options.h diff --git a/src/pass.c b/nwipe/src/pass.c similarity index 100% rename from src/pass.c rename to nwipe/src/pass.c diff --git a/src/pass.h b/nwipe/src/pass.h similarity index 100% rename from src/pass.h rename to nwipe/src/pass.h diff --git a/src/prng.c b/nwipe/src/prng.c similarity index 100% rename from src/prng.c rename to nwipe/src/prng.c diff --git a/src/prng.h b/nwipe/src/prng.h similarity index 100% rename from src/prng.h rename to nwipe/src/prng.h diff --git a/src/version.c b/nwipe/src/version.c similarity index 64% rename from src/version.c rename to nwipe/src/version.c index 360c812..706e41a 100644 --- a/src/version.c +++ b/nwipe/src/version.c @@ -4,23 +4,7 @@ * used by configure to dynamically assign those values * to documentation files. */ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -const char *version_string = "0.20"; -======= -const char *version_string = "0.18"; ->>>>>>> parent of 263d5d1... bump version to 0.19 -======= const char *version_string = "0.22"; ->>>>>>> e7d9ff73fe76e9fcc04847eba2806bd0904f0499 -======= -const char *version_string = "0.20"; ->>>>>>> parent of b808b84... Revert "bump version to 0.19" -======= -const char *version_string = "0.22"; ->>>>>>> 464bf788c534bf67a1d7290f2175dcf925f5f9ed const char *program_name = "nwipe"; const char *author_name = "Martijn van Brummelen"; const char *email_address = "git@brumit.nl"; diff --git a/src/version.h b/nwipe/src/version.h similarity index 100% rename from src/version.h rename to nwipe/src/version.h