1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 00:07:34 +00:00

Userland: Fix many compiler warnings.

This commit is contained in:
Andreas Kling 2019-06-22 15:47:08 +02:00
parent 0deade2883
commit 5980007e44
13 changed files with 22 additions and 19 deletions

View file

@ -39,7 +39,7 @@ CArgsParser::CArgsParser(const String& program_name)
{ {
} }
CArgsParserResult CArgsParser::parse(const int argc, const char** argv) CArgsParserResult CArgsParser::parse(int argc, char** argv)
{ {
CArgsParserResult res; CArgsParserResult res;
@ -57,7 +57,7 @@ CArgsParserResult CArgsParser::parse(const int argc, const char** argv)
return res; return res;
} }
int CArgsParser::parse_next_param(const int index, const char** argv, const int params_left, CArgsParserResult& res) int CArgsParser::parse_next_param(int index, char** argv, const int params_left, CArgsParserResult& res)
{ {
if (params_left == 0) if (params_left == 0)
return 0; return 0;

View file

@ -30,7 +30,7 @@ class CArgsParser {
public: public:
CArgsParser(const String& program_name); CArgsParser(const String& program_name);
CArgsParserResult parse(const int argc, const char** argv); CArgsParserResult parse(int argc, char** argv);
void add_required_arg(const String& name, const String& description); void add_required_arg(const String& name, const String& description);
void add_required_arg(const String& name, const String& value_name, const String& description); void add_required_arg(const String& name, const String& value_name, const String& description);
@ -53,7 +53,7 @@ private:
bool required; bool required;
}; };
int parse_next_param(const int index, const char** argv, const int params_left, CArgsParserResult& res); int parse_next_param(int index, char** argv, const int params_left, CArgsParserResult& res);
bool is_param_valid(const String& param_name); bool is_param_valid(const String& param_name);
bool check_required_args(const CArgsParserResult& res); bool check_required_args(const CArgsParserResult& res);

View file

@ -34,7 +34,7 @@ void start_process(const char* prog, int prio)
ASSERT(ret == 0); ASSERT(ret == 0);
char* progv[256]; char* progv[256];
progv[0] = (char*)prog; progv[0] = const_cast<char*>(prog);
progv[1] = nullptr; progv[1] = nullptr;
ret = execv(prog, progv); ret = execv(prog, progv);
if (ret < 0) { if (ret < 0) {

View file

@ -1,11 +1,15 @@
#include <AK/StdLibExtras.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
static volatile bool got_alarm = false; static volatile bool got_alarm = false;
int main(int c, char** v) int main(int argc, char** argv)
{ {
UNUSED_PARAM(argc);
UNUSED_PARAM(argv);
unsigned ret = alarm(5); unsigned ret = alarm(5);
printf("alarm() with no alarm set: %u\n", ret); printf("alarm() with no alarm set: %u\n", ret);
ret = alarm(2); ret = alarm(2);

View file

@ -16,7 +16,7 @@ int main(int argc, char** argv)
args_parser.add_arg("q", "Never print filenames"); args_parser.add_arg("q", "Never print filenames");
args_parser.add_arg("v", "Always print filenames"); args_parser.add_arg("v", "Always print filenames");
CArgsParserResult args = args_parser.parse(argc, (const char**)argv); CArgsParserResult args = args_parser.parse(argc, argv);
int line_count = 0; int line_count = 0;
if (args.is_present("n")) { if (args.is_present("n")) {

View file

@ -12,7 +12,7 @@ int main(int argc, char** argv)
args_parser.add_required_single_value("target"); args_parser.add_required_single_value("target");
args_parser.add_required_single_value("link-path"); args_parser.add_required_single_value("link-path");
CArgsParserResult args = args_parser.parse(argc, (const char**)argv); CArgsParserResult args = args_parser.parse(argc, argv);
Vector<String> values = args.get_single_values(); Vector<String> values = args.get_single_values();
if (values.size() == 0) { if (values.size() == 0) {
args_parser.print_usage(); args_parser.print_usage();

View file

@ -58,7 +58,7 @@ int main(int argc, char** argv)
args_parser.add_arg("c", "show current wallpaper"); args_parser.add_arg("c", "show current wallpaper");
args_parser.add_single_value("name"); args_parser.add_single_value("name");
CArgsParserResult args = args_parser.parse(argc, (const char**)argv); CArgsParserResult args = args_parser.parse(argc, argv);
if (args.is_present("a")) if (args.is_present("a"))
return handle_show_all(); return handle_show_all();

View file

@ -39,7 +39,7 @@ int main(int argc, char** argv)
args_parser.add_arg("s", "Single shot - this instructs the program to only return one pid"); args_parser.add_arg("s", "Single shot - this instructs the program to only return one pid");
args_parser.add_arg("o", "pid", "Tells pidof to omit processes with that pid. The special pid %PPID can be used to name the parent process of the pidof program."); args_parser.add_arg("o", "pid", "Tells pidof to omit processes with that pid. The special pid %PPID can be used to name the parent process of the pidof program.");
CArgsParserResult args = args_parser.parse(argc, (const char**)argv); CArgsParserResult args = args_parser.parse(argc, argv);
bool s_arg = args.is_present("s"); bool s_arg = args.is_present("s");
bool o_arg = args.is_present("o"); bool o_arg = args.is_present("o");

View file

@ -58,7 +58,7 @@ int main(int argc, char** argv)
args_parser.add_arg("r", "Delete directory recursively."); args_parser.add_arg("r", "Delete directory recursively.");
args_parser.add_required_single_value("path"); args_parser.add_required_single_value("path");
CArgsParserResult args = args_parser.parse(argc, (const char**)argv); CArgsParserResult args = args_parser.parse(argc, argv);
Vector<String> values = args.get_single_values(); Vector<String> values = args.get_single_values();
if (values.size() == 0) { if (values.size() == 0) {
args_parser.print_usage(); args_parser.print_usage();

View file

@ -5,7 +5,7 @@ int main(int argc, char** argv)
{ {
CArgsParser args_parser("shutdown"); CArgsParser args_parser("shutdown");
args_parser.add_arg("n", "shut down now"); args_parser.add_arg("n", "shut down now");
CArgsParserResult args = args_parser.parse(argc, (const char**)argv); CArgsParserResult args = args_parser.parse(argc, argv);
if (args.is_present("n")) { if (args.is_present("n")) {
syscall(SC_halt); syscall(SC_halt);

View file

@ -56,7 +56,6 @@ static int handle_show_all()
return 1; return 1;
} }
char pathbuf[PATH_MAX];
while (di.has_next()) { while (di.has_next()) {
String variable_name = di.next_path(); String variable_name = di.next_path();
printf("%s = %s\n", variable_name.characters(), read_var(variable_name).characters()); printf("%s = %s\n", variable_name.characters(), read_var(variable_name).characters());
@ -89,7 +88,7 @@ int main(int argc, char** argv)
args_parser.add_arg("a", "show all variables"); args_parser.add_arg("a", "show all variables");
args_parser.add_single_value("variable=[value]"); args_parser.add_single_value("variable=[value]");
CArgsParserResult args = args_parser.parse(argc, (const char**)argv); CArgsParserResult args = args_parser.parse(argc, argv);
if (args.is_present("a")) { if (args.is_present("a")) {
return handle_show_all(); return handle_show_all();

View file

@ -82,7 +82,7 @@ int main(int argc, char* argv[])
args_parser.add_arg("n", "lines", "fetch the specified number of lines"); args_parser.add_arg("n", "lines", "fetch the specified number of lines");
args_parser.add_required_single_value("file"); args_parser.add_required_single_value("file");
CArgsParserResult args = args_parser.parse(argc, (const char**)argv); CArgsParserResult args = args_parser.parse(argc, argv);
Vector<String> values = args.get_single_values(); Vector<String> values = args.get_single_values();
if (values.size() != 1) { if (values.size() != 1) {

View file

@ -5,9 +5,9 @@
#include <ctype.h> #include <ctype.h>
#include <stdio.h> #include <stdio.h>
bool output_chars = false; static bool output_chars = false;
bool output_words = false; static bool output_words = false;
bool output_lines = false; static bool output_lines = false;
struct Count { struct Count {
String file; String file;
@ -74,7 +74,7 @@ int main(int argc, char** argv)
args_parser.add_arg("c", "Include bytes in count"); args_parser.add_arg("c", "Include bytes in count");
args_parser.add_arg("m", "Include chars in count"); args_parser.add_arg("m", "Include chars in count");
args_parser.add_arg("w", "Include words in count"); args_parser.add_arg("w", "Include words in count");
CArgsParserResult args = args_parser.parse(argc, (const char**)argv); CArgsParserResult args = args_parser.parse(argc, (char**)argv);
if (args.is_present("l")) { if (args.is_present("l")) {
output_lines = true; output_lines = true;