mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

replace assert usage

Browse Source
This commit is contained in:
okan 2015-06-28 19:50:46 +00:00
parent 18f63629fd
commit 17720de4ab
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client.c
View File

@ -21,7 +21,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/queue.h> #include <sys/queue.h>
#include <assert.h>
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
@ -635,8 +634,8 @@ match:
/* Now, do some garbage collection. */ /* Now, do some garbage collection. */
if (cc->nameqlen > CLIENT_MAXNAMEQLEN) { if (cc->nameqlen > CLIENT_MAXNAMEQLEN) {
wn = TAILQ_FIRST(&cc->nameq); if ((wn = TAILQ_FIRST(&cc->nameq)) == NULL)
assert(wn != NULL); errx(1, "client_setname: window name queue empty");
TAILQ_REMOVE(&cc->nameq, wn, entry); TAILQ_REMOVE(&cc->nameq, wn, entry);
free(wn->name); free(wn->name);
free(wn); free(wn);

5
group.c
View File

@ -22,7 +22,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/queue.h> #include <sys/queue.h>
#include <assert.h>
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
@ -264,9 +263,9 @@ group_cycle(struct screen_ctx *sc, int flags)
{ {
struct group_ctx *gc, *showgroup = NULL; struct group_ctx *gc, *showgroup = NULL;
assert(sc->group_active != NULL); if (((gc = sc->group_active)) == NULL)
errx(1, "group_cycle: no active group");
gc = sc->group_active;
for (;;) { for (;;) {
gc = (flags & CWM_RCYCLE) ? TAILQ_PREV(gc, group_ctx_q, gc = (flags & CWM_RCYCLE) ? TAILQ_PREV(gc, group_ctx_q,
entry) : TAILQ_NEXT(gc, entry); entry) : TAILQ_NEXT(gc, entry);

4
search.c
View File

@ -21,7 +21,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/queue.h> #include <sys/queue.h>
#include <assert.h>
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
#include <fnmatch.h> #include <fnmatch.h>
@ -106,7 +105,8 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search)
if ((cc->flags & CLIENT_HIDDEN) && (tier > 0)) if ((cc->flags & CLIENT_HIDDEN) && (tier > 0))
tier--; tier--;
assert(tier < nitems(tierp)); if (tier >= nitems(tierp))
errx(1, "search_match_client: invalid tier");
/* /*
* If you have a tierp, insert after it, and make it * If you have a tierp, insert after it, and make it