rpms/acpitool
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
acpitool/cleanup.patch
Al Stone 8cd89eeab0 Did a lot of cleanup and bug fixing, trying to make this viable 
Signed-off-by: Al Stone <ahs3@redhat.com>
2018-10-26 15:11:23 -06:00

371 lines
9.5 KiB
Diff
Raw Permalink Blame History

Cleanup all of the warnings from implicit char const * casting
ISO C++ used to allow:
char *foo;
foo = "my string";
The standard has since changed, and this patch changes to the new
expectation:
char const *foo; // which makes more sense
foo = "my string";
Signed-off-by: Al Stone <ahs3@redhat.com>
diff -NaurEZbwB acpitool-0.5.1.orig/src/ac_adapter.cpp acpitool-0.5.1/src/ac_adapter.cpp
--- acpitool-0.5.1.orig/src/ac_adapter.cpp 2018-10-26 14:08:08.527714586 -0600
+++ acpitool-0.5.1/src/ac_adapter.cpp 2018-10-26 14:24:33.819571023 -0600
@@ -50,7 +50,8 @@
int Do_AC_Info(int verbose) // wrapper around the other 2 functions //
{
ifstream file_in;
- char *dirname, filename[4][50], str[40];
+ char const *dirname;
+ char filename[4][50], str[40];
int ac_count = 0;
DIR *ac_dir;
struct dirent *ac_dirent;
@@ -87,7 +88,8 @@
int Do_AC_Info_Proc(int verbose)
{
ifstream file_in;
- char *dirname, filename[4][50], str[40];
+ char const *dirname;
+ char filename[4][50], str[40];
int ac_count = 0;
DIR *ac_dir;
struct dirent *ac_dirent;
@@ -152,7 +154,7 @@
char filename[2][65], str[100], temp[100], attr[100];
int ac_count = 0, start = 0, findex = 0;
DIR *ac_dir;
- char *name, *dirname;
+ char const *name, *dirname;
dirname = "/sys/class/power_supply/"; //find all entries in this dir
diff -NaurEZbwB acpitool-0.5.1.orig/src/acpitool.cpp acpitool-0.5.1/src/acpitool.cpp
--- acpitool-0.5.1.orig/src/acpitool.cpp 2018-10-26 14:08:08.527714586 -0600
+++ acpitool-0.5.1/src/acpitool.cpp 2018-10-26 14:23:21.903926202 -0600
@@ -64,7 +64,8 @@
int Has_ACPI(char *c)
{
ifstream file_in, file2_in;
- char *filename, *filename2, str[50];
+ char const *filename, *filename2;
+ char str[50];
filename = "/proc/acpi/info";
filename2 = "/sys/module/acpi/parameters/acpica_version";
@@ -104,6 +105,7 @@
return 1;
}
}
+ return 0;
}
@@ -137,7 +139,8 @@
int Get_Kernel_Version(char *c, int verbose)
{
ifstream file_in;
- char *filename, str[20];
+ char const *filename;
+ char str[20];
filename = "/proc/sys/kernel/osrelease";
@@ -185,7 +188,8 @@
int Set_Kernel_Version()
{
ifstream file_in;
- char *filename, str[10];
+ char const *filename;
+ char str[10];
filename = "/proc/sys/kernel/osrelease";
@@ -218,7 +222,8 @@
int Do_Thermal_Info(const int show_trip, int verbose)
{
ifstream file_in, file_in2;
- char *dirname, str[120];
+ char const *dirname;
+ char str[120];
vector<string> filename;
DIR *thermal_dir;
@@ -341,7 +346,8 @@
int Do_Fan_Info(int verbose)
{
ifstream file_in;
- char *dirname, filename[4][50], str[40];
+ char const *dirname;
+ char filename[4][50], str[40];
int fan_count = 0;
DIR *fan_dir;
struct dirent *fan_dirent;
@@ -416,7 +422,7 @@
int Show_WakeUp_Devices(int verbose)
{
ifstream file_in;
- char *filename;
+ char const *filename;
string str;
filename = "/proc/acpi/wakeup";
@@ -461,7 +467,8 @@
int Toggle_WakeUp_Device(const int Device, int verbose)
{
ofstream file_out;
- char *filename; string str;
+ char const *filename;
+ string str;
int index = 1; int charindex = 0;
std::vector <std::string> Name(index); // Never is enough, use dynamic structures //
filename = "/proc/acpi/wakeup";
@@ -527,7 +534,7 @@
int Do_Suspend(int State) //put system in sleep state 3 or 4 (standby) //
{
ofstream file_out;
- char *filename, *str;
+ char const *filename, *str;
Set_Kernel_Version();
diff -NaurEZbwB acpitool-0.5.1.orig/src/asus.cpp acpitool-0.5.1/src/asus.cpp
--- acpitool-0.5.1.orig/src/asus.cpp 2018-10-26 14:08:08.527714586 -0600
+++ acpitool-0.5.1/src/asus.cpp 2018-10-26 14:28:37.753758221 -0600
@@ -45,7 +45,7 @@
int Has_Asus_ACPI()
{
ifstream file_in;
- char *filename;
+ char const *filename;
filename = "/proc/acpi/asus";
@@ -82,7 +82,8 @@
int Do_Asus_LCD_Info()
{
ifstream file_in;
- char *filename, lcdb[40];
+ char const *filename;
+ char lcdb[40];
filename = "/proc/acpi/asus/brn";
@@ -116,7 +117,7 @@
int Set_Asus_LCD_Level(int z)
{
ofstream file_out;
- char *filename;
+ char const *filename;
filename = "/proc/acpi/asus/brn";
@@ -144,7 +145,7 @@
int Do_Asus_Video_Info()
{
ifstream file_in;
- char *filename;
+ char const *filename;
int type;
filename = "/proc/acpi/asus/disp";
@@ -199,7 +200,8 @@
int Do_Asus_Info()
{
ifstream file_in;
- char *filename, info[255];
+ char const *filename;
+ char info[255];
filename = "/proc/acpi/asus/info";
@@ -264,7 +266,7 @@
int Set_Asus_LCD_State(int o)
{
ofstream file_out;
- char *filename;
+ char const *filename;
filename = "/proc/acpi/asus/lcd";
file_out.open(filename);
@@ -289,7 +291,7 @@
int Set_MLed(int state)
{
ofstream file_out;
- char *filename;
+ char const *filename;
filename = "/proc/acpi/asus/mled";
file_out.open(filename);
@@ -314,7 +316,7 @@
int Set_WLed(int state)
{
ofstream file_out;
- char *filename;
+ char const *filename;
filename = "/proc/acpi/asus/wled";
file_out.open(filename);
diff -NaurEZbwB acpitool-0.5.1.orig/src/battery.cpp acpitool-0.5.1/src/battery.cpp
--- acpitool-0.5.1.orig/src/battery.cpp 2018-10-26 14:08:08.527714586 -0600
+++ acpitool-0.5.1/src/battery.cpp 2018-10-26 14:34:12.828762620 -0600
@@ -355,7 +355,8 @@
char filename[4][65], str[100], temp[100];
int bat_count = 0, start = 0, findex = 0;
DIR *battery_dir;
- char *name, *dirname;
+ char *name;
+ char const *dirname;
dirname = "/proc/acpi/battery/"; //find all entries in this dir
// dirname = "/home/david/dropzone/data/devel/acpi/battery/"; // keep this for testing //
@@ -538,7 +539,8 @@
char filename[6][65], str[100], temp[100], attr[100];
int bat_count = 0, start = 0, findex = 0, value = 0;
DIR *battery_dir;
- char *name, *dirname;
+ char *name;
+ char const *dirname;
dirname = "/sys/class/power_supply/"; //find all entries in this dir
@@ -743,7 +745,8 @@
int Count_Batteries_ProcFS()
{
DIR *battery_dir;
- char *name, *dirname;
+ char *name;
+ char const *dirname;
int t = 0;
dirname = "/proc/acpi/battery/";
@@ -789,7 +792,8 @@
{
DIR *battery_dir;
char filename[4][65], str[100];
- char *name, *dirname;
+ char *name;
+ char const *dirname;
int findex = 0, batcount = 0;
/* Since kernel 2.6.24, the acpi interface is gradually being moved from /proc/acpi/... to the sys filesystem. */
diff -NaurEZbwB acpitool-0.5.1.orig/src/cpu.cpp acpitool-0.5.1/src/cpu.cpp
--- acpitool-0.5.1.orig/src/cpu.cpp 2018-10-26 14:08:08.527714586 -0600
+++ acpitool-0.5.1/src/cpu.cpp 2018-10-26 14:29:35.222273504 -0600
@@ -48,7 +48,8 @@
int Show_CPU_Info()
{
ifstream file_in, file2_in;
- char *dirname, filename[25][70], str[300], temp[130];
+ char const *dirname;
+ char filename[25][70], str[300], temp[130];
int cpu_count = 0, findex = 0, thrott = 0;
long int max_cstate = 0, cst_cnt = 0, cst_usage_abs[8],
cst_usage_notC0 = 0;
diff -NaurEZbwB acpitool-0.5.1.orig/src/thinkpad.cpp acpitool-0.5.1/src/thinkpad.cpp
--- acpitool-0.5.1.orig/src/thinkpad.cpp 2018-10-26 14:08:08.526714577 -0600
+++ acpitool-0.5.1/src/thinkpad.cpp 2018-10-26 14:31:29.979302456 -0600
@@ -12,7 +12,7 @@
int Has_Thinkpad_ACPI()
{
ifstream file_in;
- char *filename;
+ char const *filename;
filename = "/proc/acpi/ibm";
@@ -27,7 +27,7 @@
int Eject_Thinkpad_Bay()
{
ofstream bay;
- char *filename;
+ char const *filename;
if (!Has_Thinkpad_ACPI())
{
@@ -54,7 +54,7 @@
int Set_Thinkpad_LCD_Level(int z)
{
ofstream bright;
- char *filename;
+ char const *filename;
filename = "/proc/acpi/ibm/brightness";
@@ -78,7 +78,8 @@
int Do_Thinkpad_Fan_Info()
{
ifstream fan;
- char *filename, *status, *speed;
+ char const *filename;
+ char *status, *speed;
char line[32];
int i;
diff -NaurEZbwB acpitool-0.5.1.orig/src/toshiba.cpp acpitool-0.5.1/src/toshiba.cpp
--- acpitool-0.5.1.orig/src/toshiba.cpp 2018-10-26 14:08:08.526714577 -0600
+++ acpitool-0.5.1/src/toshiba.cpp 2018-10-26 14:26:28.736601409 -0600
@@ -45,7 +45,7 @@
int Has_Toshiba_ACPI()
{
ifstream file_in;
- char *filename;
+ char const *filename;
filename = "/proc/acpi/toshiba";
@@ -82,7 +82,8 @@
int Do_Toshiba_Fan_Info()
{
ifstream file_in;
- char *filename, str[40];
+ char const *filename;
+ char str[40];
filename = "/proc/acpi/toshiba/fan";
@@ -132,7 +133,8 @@
int Do_LCD_Info()
{
ifstream file_in;
- char *filename, str[40];
+ char const *filename;
+ char str[40];
filename = "/proc/acpi/toshiba/lcd";
@@ -166,7 +168,8 @@
int Force_Fan(int s)
{
ofstream file_out;
- char *filename, str[15];
+ char const *filename;
+ char str[15];
filename = "/proc/acpi/toshiba/fan";
@@ -200,7 +203,8 @@
int Set_LCD_Level(int l)
{
ofstream file_out;
- char *filename, str[15];
+ char const *filename;
+ char str[15];
filename = "/proc/acpi/toshiba/lcd";
@@ -230,7 +234,8 @@
int Do_Video_Info()
{
ifstream file_in;
- char *filename, str[40];
+ char const *filename;
+ char str[40];
int lcd, crt;
filename = "/proc/acpi/toshiba/video";
Reference in a new issue View git blame Copy permalink