From 526dd292b8a936cd22752c3ab00911d10dfefd6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Frohm=C3=BCller?= Date: Tue, 4 Oct 2022 08:46:09 +0200 Subject: [PATCH] Fix some minor compiler warnings. Minor changes to build system. --- .gitignore | 3 ++- CMakeLists.txt | 7 ++----- src/opensuperclone/clone_gui2.c | 6 +++--- src/oscviewer/CMakeLists.txt | 8 -------- src/oscviewer/oscviewer2.c | 8 ++++---- src/oscviewer/oscviewer2.h | 2 +- src/oscviewer/oscviewer3.c | 6 +++--- 7 files changed, 15 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 61b8896..3a500f3 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ cmake_install.cmake install_manifest.txt compile_commands.json CTestTestfile.cmake -_deps \ No newline at end of file +_deps +build \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d9606c..a08d99b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,16 +4,13 @@ cmake_minimum_required(VERSION 3.10) project(OpenSuperClone VERSION 2.3.3) # Set the GTK version to 2.x -set(GTKVER 2) - -set(CMAKE_C_COMPILER gcc) +set(GTKVER 2 CACHE STRING "GTK Version") set(GCC_OPTIONS -Wall - -W + -Wextra -Wno-deprecated-declarations -fcommon - -lcurl ) set(CMAKE_EXE_LINKER_FLAGS "-export-dynamic") diff --git a/src/opensuperclone/clone_gui2.c b/src/opensuperclone/clone_gui2.c index 9d6e941..11fe023 100644 --- a/src/opensuperclone/clone_gui2.c +++ b/src/opensuperclone/clone_gui2.c @@ -1164,15 +1164,15 @@ int print_gui_error_message_ccc(char *message, char *title, int type) GtkDialogFlags message_type; if (type) { - message_type = GTK_MESSAGE_WARNING; + message_type = (GtkDialogFlags)GTK_MESSAGE_WARNING; // dialog = gtk_message_dialog_new(GTK_WINDOW(main_window_ccc), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", message); } else { - message_type = GTK_MESSAGE_INFO; + message_type = (GtkDialogFlags)GTK_MESSAGE_INFO; // dialog = gtk_message_dialog_new(GTK_WINDOW(main_window_ccc), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", message); } - dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_DESTROY_WITH_PARENT, message_type, GTK_BUTTONS_OK, "%s", message); + dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_DESTROY_WITH_PARENT, (GtkMessageType)message_type, GTK_BUTTONS_OK, "%s", message); gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE); gtk_window_set_title(GTK_WINDOW(dialog), title); gtk_dialog_run(GTK_DIALOG(dialog)); diff --git a/src/oscviewer/CMakeLists.txt b/src/oscviewer/CMakeLists.txt index 220ec7c..d603ada 100644 --- a/src/oscviewer/CMakeLists.txt +++ b/src/oscviewer/CMakeLists.txt @@ -17,12 +17,4 @@ add_executable(oscviewer ${SOURCES} oscviewer${GTKVER}_glade.h) target_link_libraries(oscviewer ${LIBRARIES}) -set(GCC_OPTIONS - -Wall - -W - -Wno-deprecated-declarations - -fcommon - -lcurl -) - target_compile_options(oscviewer PRIVATE ${GCC_OPTIONS}) \ No newline at end of file diff --git a/src/oscviewer/oscviewer2.c b/src/oscviewer/oscviewer2.c index 9a86040..cd21b1c 100644 --- a/src/oscviewer/oscviewer2.c +++ b/src/oscviewer/oscviewer2.c @@ -2909,7 +2909,7 @@ int get_block_information(long long position, long long size) long long bad = 0; long long finished = 0; long long hightime = 0; - char tempchar[256]; + char tempchar[384]; char lines[maxcount * sizeof(tempchar)]; strcpy(lines, ""); // process current status @@ -3323,15 +3323,15 @@ int print_gui_error_message(char *message, char *title, int type) GtkDialogFlags message_type; if (type) { - message_type = GTK_MESSAGE_WARNING; + message_type = (GtkDialogFlags)GTK_MESSAGE_WARNING; // dialog = gtk_message_dialog_new(GTK_WINDOW(main_window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", message); } else { - message_type = GTK_MESSAGE_INFO; + message_type = (GtkDialogFlags)GTK_MESSAGE_INFO; // dialog = gtk_message_dialog_new(GTK_WINDOW(main_window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", message); } - dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_DESTROY_WITH_PARENT, message_type, GTK_BUTTONS_OK, "%s", message); + dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_DESTROY_WITH_PARENT, (GtkMessageType)message_type, GTK_BUTTONS_OK, "%s", message); gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE); gtk_window_set_title(GTK_WINDOW(dialog), title); gtk_dialog_run(GTK_DIALOG(dialog)); diff --git a/src/oscviewer/oscviewer2.h b/src/oscviewer/oscviewer2.h index d4058ce..e3153f8 100644 --- a/src/oscviewer/oscviewer2.h +++ b/src/oscviewer/oscviewer2.h @@ -347,7 +347,7 @@ int selected_color = WHITE; int time_color = WHITE; int domain_color = YELLOW; int main_grid_size = MAINGRIDSIZE; -gint timeout_tag = NULL; +gint timeout_tag = 0; int autotimer_on = 0; int show_bad_head = 0; int show_good_data = 0; diff --git a/src/oscviewer/oscviewer3.c b/src/oscviewer/oscviewer3.c index 3972e5d..5677af2 100644 --- a/src/oscviewer/oscviewer3.c +++ b/src/oscviewer/oscviewer3.c @@ -2392,15 +2392,15 @@ int print_gui_error_message(char *message, char *title, int type) GtkDialogFlags message_type; if (type) { - message_type = GTK_MESSAGE_WARNING; + message_type = (GtkDialogFlags)GTK_MESSAGE_WARNING; // dialog = gtk_message_dialog_new(GTK_WINDOW(main_window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", message); } else { - message_type = GTK_MESSAGE_INFO; + message_type = (GtkDialogFlags)GTK_MESSAGE_INFO; // dialog = gtk_message_dialog_new(GTK_WINDOW(main_window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", message); } - dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_DESTROY_WITH_PARENT, message_type, GTK_BUTTONS_OK, "%s", message); + dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_DESTROY_WITH_PARENT, (GtkMessageType)message_type, GTK_BUTTONS_OK, "%s", message); gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE); gtk_window_set_title(GTK_WINDOW(dialog), title); gtk_dialog_run(GTK_DIALOG(dialog));