X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=c14e854e53c16fd33afff1ac106be4573302ffba;hb=ea1edcdfb28e8c22d96bcc7057541fb08ab15fc1;hp=22d92b026f3acdd6736a6675643841677f1cfed0;hpb=ff3314e7ef2a8e298ba33777318f8469f688a118;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index 22d92b0..c14e854 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -52,7 +52,7 @@
 
 static const char	*cvstag = "$scrotwm$";
 
-#define	SWM_VERSION	"0.9.13"
+#define	SWM_VERSION	"0.9.14"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -1350,14 +1350,8 @@ switchws(struct swm_region *r, union arg *args)
 	struct ws_win		*win, *winfocus = NULL, *parent = NULL;
 	struct workspace	*new_ws, *old_ws;
 
-	if (!(r && r->s)) {
-		fprintf(stderr, "r && r->s failed\n");
-		abort();
-	}
-	if (wsid < 0 || wsid > SWM_WS_MAX) {
-		fprintf(stderr, "illegal wsid\n");
-		abort();
-	}
+	if (!(r && r->s))
+		return;
 
 	this_r = r;
 	old_ws = this_r->ws;
@@ -1367,11 +1361,8 @@ switchws(struct swm_region *r, union arg *args)
 	    "%d -> %d\n", r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r),
 	    old_ws->idx, wsid);
 
-	if (new_ws == NULL || old_ws == NULL) {
-		fprintf(stderr, "new_ws = %p old_ws = %p\n", new_ws, old_ws);
-		abort();
-	}
-
+	if (new_ws == NULL || old_ws == NULL)
+		return;
 	if (new_ws == old_ws)
 		return;
 
@@ -1672,10 +1663,6 @@ stack(void) {
 			    "(screen %d, region %d)\n", r->ws->idx, i, j++);
 
 			/* start with screen geometry, adjust for bar */
-			if (r == NULL) {
-				fprintf(stderr, "illegal r\n");
-				abort();
-			}
 			g = r->g;
 			g.w -= 2;
 			g.h -= 2;
@@ -1683,18 +1670,6 @@ stack(void) {
 				g.y += bar_height;
 				g.h -= bar_height;
 			}
-			if (r->ws == NULL) {
-				fprintf(stderr, "illegal ws\n");
-				abort();
-			}
-			if (r->ws->cur_layout == NULL) {
-				fprintf(stderr, "illegal cur_layout\n");
-				abort();
-			}
-			if (r->ws->cur_layout->l_stack == NULL) {
-				fprintf(stderr, "illegal l_stack\n");
-				abort();
-			}
 			r->ws->cur_layout->l_stack(r->ws, &g);
 		}
 	}