diff options
| author | okan <okan> | 2012-11-08 20:18:19 +0000 |
|---|---|---|
| committer | okan <okan> | 2012-11-08 20:18:19 +0000 |
| commit | 04d4ed7b7e1f71d72e326429dc816988892be7eb (patch) | |
| tree | a0bcae213aead87341f7efae116532e34ce33207 | |
| parent | c9c0a5fdbb8ce451b9706fc33999a1667b60cd6f (diff) | |
| download | cwm-04d4ed7b7e1f71d72e326429dc816988892be7eb.tar.gz cwm-04d4ed7b7e1f71d72e326429dc816988892be7eb.tar.xz cwm-04d4ed7b7e1f71d72e326429dc816988892be7eb.zip | |
fix some warnings; inspired by a diff from Thordur Bjornsson.
| -rw-r--r-- | calmwm.h | 2 | ||||
| -rw-r--r-- | group.c | 4 | ||||
| -rw-r--r-- | xutil.c | 9 |
3 files changed, 8 insertions, 7 deletions
diff --git a/calmwm.h b/calmwm.h index 4bc97f4..8c06db4 100644 --- a/calmwm.h +++ b/calmwm.h @@ -481,7 +481,7 @@ void xu_ewmh_net_wm_number_of_desktops(struct screen_ctx *); void xu_ewmh_net_showing_desktop(struct screen_ctx *); void xu_ewmh_net_virtual_roots(struct screen_ctx *); void xu_ewmh_net_current_desktop(struct screen_ctx *, long); -void xu_ewmh_net_desktop_names(struct screen_ctx *, unsigned char *, int); +void xu_ewmh_net_desktop_names(struct screen_ctx *, char *, int); void xu_ewmh_net_wm_desktop(struct client_ctx *); diff --git a/group.c b/group.c index dd748ea..cf431c6 100644 --- a/group.c +++ b/group.c @@ -472,7 +472,7 @@ group_update_names(struct screen_ctx *sc) strings = xmalloc((nstrings < CALMWM_NGROUPS ? CALMWM_NGROUPS : nstrings) * sizeof(*strings)); - p = prop_ret; + p = (char *)prop_ret; while (n < nstrings) { strings[n++] = xstrdup(p); p += strlen(p) + 1; @@ -502,7 +502,7 @@ group_update_names(struct screen_ctx *sc) static void group_set_names(struct screen_ctx *sc) { - unsigned char *p, *q; + char *p, *q; size_t len = 0, tlen, slen; int i; diff --git a/xutil.c b/xutil.c index bcde1c5..110ce87 100644 --- a/xutil.c +++ b/xutil.c @@ -188,7 +188,7 @@ xu_getstrprop(Window win, Atom atm, char **text) { XTextProperty prop2; if (Xutf8TextListToTextProperty(X_Dpy, list, nitems, XUTF8StringStyle, &prop2) == Success) { - *text = xstrdup(prop2.value); + *text = xstrdup((const char *)prop2.value); XFree(prop2.value); } } else { @@ -292,7 +292,8 @@ xu_ewmh_net_supported_wm_check(struct screen_ctx *sc) XChangeProperty(X_Dpy, w, ewmh[_NET_SUPPORTING_WM_CHECK].atom, XA_WINDOW, 32, PropModeReplace, (unsigned char *)&w, 1); XChangeProperty(X_Dpy, w, ewmh[_NET_WM_NAME].atom, - XA_WM_NAME, 8, PropModeReplace, WMNAME, strlen(WMNAME)); + XA_WM_NAME, 8, PropModeReplace, (unsigned char *)WMNAME, + strlen(WMNAME)); } void @@ -396,10 +397,10 @@ xu_ewmh_net_current_desktop(struct screen_ctx *sc, long idx) } void -xu_ewmh_net_desktop_names(struct screen_ctx *sc, unsigned char *data, int n) +xu_ewmh_net_desktop_names(struct screen_ctx *sc, char *data, int n) { XChangeProperty(X_Dpy, sc->rootwin, ewmh[_NET_DESKTOP_NAMES].atom, - cwmh[UTF8_STRING].atom, 8, PropModeReplace, data, n); + cwmh[UTF8_STRING].atom, 8, PropModeReplace, (unsigned char *)data, n); } /* Application Window Properties */ |