diff options
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | include/sway_json_helper.h | 16 | ||||
| -rw-r--r-- | include/swaygrab/json.h | 2 | ||||
| -rw-r--r-- | sway/ipc-server.c | 7 | ||||
| -rw-r--r-- | swaybar/status_line.c | 5 | ||||
| -rw-r--r-- | swaygrab/json.c | 9 | ||||
| -rw-r--r-- | swaylock/main.c | 4 | ||||
| -rw-r--r-- | swaymsg/main.c | 4 |
9 files changed, 17 insertions, 48 deletions
diff --git a/.travis.yml b/.travis.yml index 3eeb1682..69634765 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,6 @@ compiler: - gcc - clang -env: - - BUILD_TYPE=Release - - BUILD_TYPE=Debug - - BUILD_TYPE=ASAN - arch: packages: - cmake @@ -24,7 +19,7 @@ arch: - wlc-git - libcap script: - - "cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE ." + - "cmake ." - "make" script: diff --git a/CMakeLists.txt b/CMakeLists.txt index dc521570..99081dca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,17 +9,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Werror) -# Add Address Sanitiezed build type -set(CMAKE_C_FLAGS_ASAN - "${CMAKE_C_FLAGS_DEBUG} -fsanitize=address -fno-omit-frame-pointer" - CACHE STRING "Flags used by the C compiler during address sanitizer builds." - FORCE ) -mark_as_advanced( - CMAKE_C_FLAGS_ASAN - CMAKE_EXE_LINKER_FLAGS_DEBUG - CMAKE_SHARED_LINKER_FLAGS_DEBUG - ) - list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_SOURCE_DIR}/CMake ) diff --git a/include/sway_json_helper.h b/include/sway_json_helper.h deleted file mode 100644 index 66f9cff1..00000000 --- a/include/sway_json_helper.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _SWAY_JSON_HELPER_H -#define _SWAY_JSON_HELPER_H - -#include <json-c/json.h> - -// Macros for checking a specific version. -#define JSON_C_VERSION_013 (13 << 8) - -// json-c v0.13 uses size_t for array_list_length(). -#if defined(JSON_C_VERSION_NUM) && JSON_C_VERSION_NUM >= JSON_C_VERSION_013 -typedef size_t json_ar_len_t; -#else -typedef int json_ar_len_t; -#endif - -#endif // _SWAY_JSON_HELPER_H diff --git a/include/swaygrab/json.h b/include/swaygrab/json.h index c0bd8587..c1093ef1 100644 --- a/include/swaygrab/json.h +++ b/include/swaygrab/json.h @@ -1,4 +1,4 @@ -#include "sway_json_helper.h" +#include <json-c/json.h> #include "wlc/wlc.h" void init_json_tree(int socketfd); diff --git a/sway/ipc-server.c b/sway/ipc-server.c index e10445cf..b560b930 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c @@ -15,6 +15,7 @@ #include <stdlib.h> #include <sys/ioctl.h> #include <fcntl.h> +#include <json-c/json.h> #include <list.h> #include <libinput.h> #ifdef __linux__ @@ -24,7 +25,6 @@ struct ucred { gid_t gid; }; #endif -#include "sway_json_helper.h" #include "sway/ipc-json.h" #include "sway/ipc-server.h" #include "sway/security.h" @@ -724,7 +724,7 @@ void ipc_client_handle_command(struct ipc_client *client) { } // parse requested event types - for (json_ar_len_t i = 0; i < json_object_array_length(request); i++) { + for (int i = 0; i < json_object_array_length(request); i++) { const char *event_type = json_object_get_string(json_object_array_get_idx(request, i)); if (strcmp(event_type, "workspace") == 0) { client->subscribed_events |= event_mask(IPC_EVENT_WORKSPACE); @@ -1126,8 +1126,7 @@ static void ipc_event_binding(json_object *sb_obj) { sway_log(L_DEBUG, "Sending binding::run event"); json_object *obj = json_object_new_object(); json_object_object_add(obj, "change", json_object_new_string("run")); - // sb_obj gets owned by the temporary json_object, too. - json_object_object_add(obj, "binding", json_object_get(sb_obj)); + json_object_object_add(obj, "binding", sb_obj); const char *json_string = json_object_to_json_string(obj); ipc_send_event(json_string, IPC_EVENT_BINDING); diff --git a/swaybar/status_line.c b/swaybar/status_line.c index e3cc0bf4..87e90caf 100644 --- a/swaybar/status_line.c +++ b/swaybar/status_line.c @@ -2,8 +2,8 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <json-c/json.h> -#include "sway_json_helper.h" #include "swaybar/config.h" #include "swaybar/status_line.h" #include "log.h" @@ -70,7 +70,8 @@ static void parse_json(struct bar *bar, const char *text) { bar->status->block_line = create_list(); - for (json_ar_len_t i = 0; i < json_object_array_length(results); ++i) { + int i; + for (i = 0; i < json_object_array_length(results); ++i) { json_object *full_text, *short_text, *color, *min_width, *align, *urgent; json_object *name, *instance, *separator, *separator_block_width; json_object *background, *border, *border_top, *border_bottom; diff --git a/swaygrab/json.c b/swaygrab/json.c index f0e8fa90..286085c3 100644 --- a/swaygrab/json.c +++ b/swaygrab/json.c @@ -50,7 +50,8 @@ static json_object *get_focused_container_r(json_object *c) { } else { json_object *nodes, *node, *child; json_object_object_get_ex(c, "nodes", &nodes); - for (json_ar_len_t i = 0; i < json_object_array_length(nodes); i++) { + int i; + for (i = 0; i < json_object_array_length(nodes); i++) { node = json_object_array_get_idx(nodes, i); if ((child = get_focused_container_r(node))) { @@ -59,7 +60,7 @@ static json_object *get_focused_container_r(json_object *c) { } json_object_object_get_ex(c, "floating_nodes", &nodes); - for (json_ar_len_t i = 0; i < json_object_array_length(nodes); i++) { + for (i = 0; i < json_object_array_length(nodes); i++) { node = json_object_array_get_idx(nodes, i); if ((child = get_focused_container_r(node))) { @@ -82,7 +83,7 @@ char *get_focused_output() { if (!outputs) { sway_abort("Unabled to get focused output. No nodes in tree."); } - for (json_ar_len_t i = 0; i < json_object_array_length(outputs); i++) { + for (int i = 0; i < json_object_array_length(outputs); i++) { output = json_object_array_get_idx(outputs, i); if (get_focused_container_r(output)) { @@ -130,7 +131,7 @@ json_object *get_output_container(const char *output) { json_object *outputs, *json_output, *name; json_object_object_get_ex(tree, "nodes", &outputs); - for (json_ar_len_t i = 0; i < json_object_array_length(outputs); i++) { + for (int i = 0; i < json_object_array_length(outputs); i++) { json_output = json_object_array_get_idx(outputs, i); json_object_object_get_ex(json_output, "name", &name); diff --git a/swaylock/main.c b/swaylock/main.c index 3208a45b..4b486461 100644 --- a/swaylock/main.c +++ b/swaylock/main.c @@ -3,6 +3,7 @@ #include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon-names.h> #include <security/pam_appl.h> +#include <json-c/json.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -13,7 +14,6 @@ #include <signal.h> #include <stdbool.h> #include <unistd.h> -#include "sway_json_helper.h" #include "client/window.h" #include "client/registry.h" #include "client/cairo.h" @@ -583,7 +583,7 @@ int main(int argc, char **argv) { for (i = 0; i < registry->outputs->length; ++i) { if (displays_paths[i * 2] != NULL) { - for (json_ar_len_t j = 0;; ++j) { + for (int j = 0;; ++j) { if (j >= json_object_array_length(json_outputs)) { sway_log(L_ERROR, "%s is not an extant output", displays_paths[i * 2]); exit(EXIT_FAILURE); diff --git a/swaymsg/main.c b/swaymsg/main.c index 0ee7c76f..2f9cfb14 100644 --- a/swaymsg/main.c +++ b/swaymsg/main.c @@ -9,7 +9,7 @@ #include <sys/socket.h> #include <ctype.h> #include <unistd.h> -#include "sway_json_helper.h" +#include <json-c/json.h> #include "stringop.h" #include "ipc-client.h" #include "readline.h" @@ -149,7 +149,7 @@ static void pretty_print_version(json_object *v) { static void pretty_print_clipboard(json_object *v) { if (success(v, true)) { if (json_object_is_type(v, json_type_array)) { - for (json_ar_len_t i = 0; i < json_object_array_length(v); ++i) { + for (int i = 0; i < json_object_array_length(v); ++i) { json_object *o = json_object_array_get_idx(v, i); printf("%s\n", json_object_get_string(o)); } |