X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=1751412f18b4a70c6c3d34dca787b01f9800bcd9;hb=972d8078dac803b2896f7bfb3958d9e801e3321a;hp=d1c876f422b00fe9fb28d12fd42e30303b473995;hpb=ced6f98d601b5fce8ee4cd92b292edc473f49203;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index d1c876f..1751412 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -647,7 +647,6 @@ struct ewmh_hint {
 };
 
 /* function prototypes */
-xcb_char2b_t *char2b(const char *);
 int	 conf_load(char *, int);
 void	 constrain_window(struct ws_win *, struct swm_region *, int);
 void	 do_sync(void);
@@ -672,26 +671,6 @@ void	 update_window(struct ws_win *);
 char	*get_atom_name(xcb_atom_t);
 #endif
 
-/* function definitions */
-xcb_char2b_t *
-char2b(const char *str)
-{
-	xcb_char2b_t	*s;
-	size_t		i, len;
-
-	len = strlen(str);
-	s = malloc(len * sizeof(xcb_char2b_t));
-	if (!s)
-		return (NULL);
-
-	for (i = 0; i < len; i++) {
-		s[i].byte1 = '\0';
-		s[i].byte2 = str[i];
-	}
-
-	return (s);
-}
-
 int
 parse_rgb(const char *rgb, uint16_t *rr, uint16_t *gg, uint16_t *bb)
 {
@@ -2320,8 +2299,10 @@ find_window(xcb_window_t id)
 		return (NULL);
 
 	/* if we were looking for the parent return that window instead */
-	if (r->parent == 0 || r->root == r->parent)
+	if (r->parent == 0 || r->root == r->parent) {
+		free(r);
 		return (NULL);
+	}
 
 	/* look for parent */
 	for (i = 0; i < num_screens; i++)
@@ -3751,12 +3732,10 @@ get_win_name(xcb_window_t win)
 	if (xcb_icccm_get_wm_name_reply(conn, c, &r, NULL)) {
 		if (r.name_len > 0) {
 			name = malloc(r.name_len + 1);
-			if (!name) {
-				xcb_icccm_get_text_property_reply_wipe(&r);
-				return (NULL);
+			if (name) {
+				memcpy(name, r.name, r.name_len);
+				name[r.name_len] = '\0';
 			}
-			memcpy(name, r.name, r.name_len);
-			name[r.name_len] = '\0';
 		}
 		xcb_icccm_get_text_property_reply_wipe(&r);
 	}
@@ -7116,7 +7095,7 @@ maprequest(xcb_map_request_event_t *e)
 char *
 get_atom_name(xcb_atom_t atom)
 {
-	char				*name;
+	char				*name = NULL;
 	size_t				len;
 	xcb_get_atom_name_reply_t	*r;
 
@@ -7130,14 +7109,12 @@ get_atom_name(xcb_atom_t atom)
 			if (name) {
 				memcpy(name, xcb_get_atom_name_name(r), len);
 				name[len] = '\0';
-
-				return name;
 			}
 		}
 		free(r);
 	}
 
-	return NULL;
+	return (name);
 }
 #endif