aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Phillips <dbphillipsnz@gmail.com>2015-09-01 17:45:46 +1200
committerDavid Phillips <dbphillipsnz@gmail.com>2015-09-01 17:45:46 +1200
commita3e613bae93526edebb6546c6c9d02d6587145f3 (patch)
tree6deffa45e77aad2fb82960a0e064362dd61dca47
parentb6338e7753d0862276d7ed38eab2a19d8b6544b6 (diff)
downloadparamano-a3e613bae93526edebb6546c6c9d02d6587145f3.tar.xz
Removed not-very-useful config reload
-rw-r--r--Makefile2
-rw-r--r--paramano.c6
-rw-r--r--paramano.h1
-rw-r--r--reload.c36
-rw-r--r--reload.h24
5 files changed, 0 insertions, 69 deletions
diff --git a/Makefile b/Makefile
index f279784..822f319 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,6 @@ DEPS += bat_tray.h \
getfreq.h \
getgov.h \
paramano.h \
- reload.h \
tray.h \
paramano_set_interface.h
@@ -97,7 +96,6 @@ paramano: bat_tray.o \
getcore.o \
getfreq.o \
getgov.o \
- reload.o \
paramano.o \
tray.o \
paramano_set_interface.o
diff --git a/paramano.c b/paramano.c
index e965e68..b73462e 100644
--- a/paramano.c
+++ b/paramano.c
@@ -34,12 +34,6 @@ int main(int argc, char** argv)
return 1;
}
- struct sigaction sig_act;
- sig_act.sa_handler = reload_config;
- sig_act.sa_flags = 0;
- sigemptyset(&sig_act.sa_mask);
-
- sigaction(SIGUSR1, &sig_act, NULL);
config_init();
gc_init();
gg_init();
diff --git a/paramano.h b/paramano.h
index f7c27f4..430226a 100644
--- a/paramano.h
+++ b/paramano.h
@@ -36,7 +36,6 @@
#include "getcore.h"
#include "getgov.h"
#include "config_file.h"
-#include "reload.h"
#include "defaults.h"
#include "common.h"
#include "paramano_set_interface.h"
diff --git a/reload.c b/reload.c
deleted file mode 100644
index 07daf33..0000000
--- a/reload.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/************************************************************************
- * This file is part of Paramano. *
- * *
- * Paramano is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License as *
- * published by the Free Software Foundation; either version 3 of the *
- * License, or (at your option) any later version. *
- * *
- * Paramano is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with Paramano. If not, see *
- * <http://www.gnu.org/licenses/>. *
- ************************************************************************/
-
-#include "paramano.h"
-
-
-/*************************************************************************
- * Catches the USR1 sig. Reloads the configuration files and applies any
- * new changes/config etc
- ************************************************************************/
-void reload_config()
-{
- // Reload config
- config_init();
-
- // Hide battery icon if told to
- DEFAULT_SHOW_BATTERY? bat_tray_show() : bat_tray_hide();
-
- // Update governor and frequency defaults
- tray_set_defaults();
-}
diff --git a/reload.h b/reload.h
deleted file mode 100644
index 030147e..0000000
--- a/reload.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/************************************************************************
- * This file is part of Paramano. *
- * *
- * Paramano is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License as *
- * published by the Free Software Foundation; either version 3 of the *
- * License, or (at your option) any later version. *
- * *
- * Paramano is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with Paramano. If not, see *
- * <http://www.gnu.org/licenses/>. *
- ************************************************************************/
-
-#ifndef RELOAD_H
-#define RELOAD_H
-
-void reload_config();
-
-#endif