nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cast con id as uintptr_t (#2298) 

Use `uintptr_t` to cast the con id to int instead of `long int`. This
type is guaranteed to hold the pointer as an int regardless of platform.

fixes #2283
This commit is contained in:
Tony Crisci 2016-04-15 03:27:43 -04:00 committed by Michael Stapelberg
parent 80dddd9961
commit e690e3d483
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/commands.c
View File

@ -9,6 +9,7 @@
* commands.c: all command functions (see commands_parser.c) * commands.c: all command functions (see commands_parser.c)
* *
*/ */
#include <stdint.h>
#include <float.h> #include <float.h>
#include <stdarg.h> #include <stdarg.h>
@ -1625,7 +1626,7 @@ void cmd_open(I3_CMD) {
ystr("success"); ystr("success");
y(bool, true); y(bool, true);
ystr("id"); ystr("id");
y(integer, (long int)con); y(integer, (uintptr_t)con);
y(map_close); y(map_close);
cmd_output->needs_tree_render = true; cmd_output->needs_tree_render = true;

5
src/ipc.c
View File

@ -12,6 +12,7 @@
#include "all.h" #include "all.h"
#include "yajl_utils.h" #include "yajl_utils.h"
#include <stdint.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
#include <fcntl.h> #include <fcntl.h>
@ -217,7 +218,7 @@ static void dump_binding(yajl_gen gen, Binding *bind) {
void dump_node(yajl_gen gen, struct Con *con, bool inplace_restart) { void dump_node(yajl_gen gen, struct Con *con, bool inplace_restart) {
y(map_open); y(map_open);
ystr("id"); ystr("id");
y(integer, (long int)con); y(integer, (uintptr_t)con);
ystr("type"); ystr("type");
switch (con->type) { switch (con->type) {
@ -444,7 +445,7 @@ void dump_node(yajl_gen gen, struct Con *con, bool inplace_restart) {
ystr("focus"); ystr("focus");
y(array_open); y(array_open);
TAILQ_FOREACH(node, &(con->focus_head), focused) { TAILQ_FOREACH(node, &(con->focus_head), focused) {
y(integer, (long int)node); y(integer, (uintptr_t)node);
} }
y(array_close); y(array_close);