From 63a129963c01a5c149bdcd7c13987bb8955f46a9 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Oct 26 2018 22:29:04 +0000 Subject: Clean up to enforce C++ standard usage Signed-off-by: Al Stone --- diff --git a/ChangeLog b/ChangeLog index a5dd7ce..499b96f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,19 @@ acpitool-0.5.2 - 26 Oct 2018 * src/acpitool.cpp: - handle versions of the kernel after 2.4.x/2.6.x (originally from Debian) + - Use dynamic structures instead of predefined ones (see git + log for details) + - Do not assume fixed line lengths for entries in the + /proc/acpi/wakeup file (see git log for details) + + * man/acpitool.1: + - clean up some typos (originally from Debian) + + * src/ac_adapter.cpp, src/acpitool.cpp, src/asus.cpp, + src/battery.cpp, src/cpu.cpp, src/thinkpad.cpp, src/toshiba.cpp: + - C++ used to allow string literals to be implicitly cast to + a 'char*'; that no longer is true, and 'char const*' must now + be used. Corrected the source to reflect this. acpitool-0.5.1 - 13-08-2008 diff --git a/src/ac_adapter.cpp b/src/ac_adapter.cpp index b133f13..6b2e41f 100644 --- a/src/ac_adapter.cpp +++ b/src/ac_adapter.cpp @@ -50,7 +50,8 @@ using namespace std; 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(int verbose) // wrapper around the other 2 functions / 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 @@ int Do_AC_Info_Sys() 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 --git a/src/acpitool.cpp b/src/acpitool.cpp index e85a7c1..f698733 100644 --- a/src/acpitool.cpp +++ b/src/acpitool.cpp @@ -64,7 +64,8 @@ int Use_Sys = 0, Use_Proc = 0; 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 @@ int Has_ACPI(char *c) return 1; } } + return 0; } @@ -137,7 +139,8 @@ int Print_ACPI_Info(int show_ac, int show_therm, int show_trip, int show_fan, in 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 Do_SysVersion_Info(int verbose) 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 Set_Kernel_Version() 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 filename; DIR *thermal_dir; @@ -341,7 +346,8 @@ int Do_Thermal_Info(const int show_trip, int verbose) 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 Do_Fan_Info(int verbose) 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 Show_WakeUp_Devices(int verbose) 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 Name(index); // Never is enough, use dynamic structures // filename = "/proc/acpi/wakeup"; @@ -527,7 +534,7 @@ int Toggle_WakeUp_Device(const int Device, int verbose) 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 --git a/src/asus.cpp b/src/asus.cpp index 3e193b3..75fea97 100644 --- a/src/asus.cpp +++ b/src/asus.cpp @@ -45,7 +45,7 @@ int Be_asus_quiet = 1; int Has_Asus_ACPI() { ifstream file_in; - char *filename; + char const *filename; filename = "/proc/acpi/asus"; @@ -82,7 +82,8 @@ int Print_Asus_Info(int show_asus_lcd, int show_asus_video, int show_asus_info, 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 Do_Asus_LCD_Info() 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 Set_Asus_LCD_Level(int z) 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_Video_Info() 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 Do_Asus_Info() 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_Asus_LCD_State(int o) 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_MLed(int state) int Set_WLed(int state) { ofstream file_out; - char *filename; + char const *filename; filename = "/proc/acpi/asus/wled"; file_out.open(filename); diff --git a/src/battery.cpp b/src/battery.cpp index 224188c..1438aba 100644 --- a/src/battery.cpp +++ b/src/battery.cpp @@ -355,7 +355,8 @@ int Get_Battery_Info_from_Proc(const int bat_nr, Battery_Info *batt_info, int ve 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 @@ int Get_Battery_Info_from_Sys(const int bat_nr, Battery_Info *batt_info, int ver 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 Get_Battery_Info_from_Sys(const int bat_nr, Battery_Info *batt_info, int ver 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 @@ int Count_Batteries_SysFS() { 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 --git a/src/cpu.cpp b/src/cpu.cpp index fd4cff4..ac84611 100644 --- a/src/cpu.cpp +++ b/src/cpu.cpp @@ -48,7 +48,8 @@ using namespace std; 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 --git a/src/thinkpad.cpp b/src/thinkpad.cpp index 662c5ef..c5eb16a 100644 --- a/src/thinkpad.cpp +++ b/src/thinkpad.cpp @@ -12,7 +12,7 @@ int IBM_be_quiet = 1; int Has_Thinkpad_ACPI() { ifstream file_in; - char *filename; + char const *filename; filename = "/proc/acpi/ibm"; @@ -27,7 +27,7 @@ int Has_Thinkpad_ACPI() int Eject_Thinkpad_Bay() { ofstream bay; - char *filename; + char const *filename; if (!Has_Thinkpad_ACPI()) { @@ -54,7 +54,7 @@ int Eject_Thinkpad_Bay() int Set_Thinkpad_LCD_Level(int z) { ofstream bright; - char *filename; + char const *filename; filename = "/proc/acpi/ibm/brightness"; @@ -78,7 +78,8 @@ int Set_Thinkpad_LCD_Level(int z) int Do_Thinkpad_Fan_Info() { ifstream fan; - char *filename, *status, *speed; + char const *filename; + char *status, *speed; char line[32]; int i; diff --git a/src/toshiba.cpp b/src/toshiba.cpp index d3f5ef8..1ab9afc 100644 --- a/src/toshiba.cpp +++ b/src/toshiba.cpp @@ -45,7 +45,7 @@ int Be_quiet = 1; int Has_Toshiba_ACPI() { ifstream file_in; - char *filename; + char const *filename; filename = "/proc/acpi/toshiba"; @@ -82,7 +82,8 @@ int Print_Toshiba_Info(int show_lcd, int show_video, int show_fan, int quiet) 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_Toshiba_Fan_Info() 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 Do_LCD_Info() 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 Force_Fan(int s) 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 Set_LCD_Level(int l) 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";