mirror of
https://github.com/leahneukirchen/cwm.git
synced 2023-08-10 21:13:12 +03:00
replace assert usage
This commit is contained in:
parent
18f63629fd
commit
17720de4ab
5
client.c
5
client.c
@ -21,7 +21,6 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/queue.h>
|
||||
|
||||
#include <assert.h>
|
||||
#include <err.h>
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
@ -635,8 +634,8 @@ match:
|
||||
|
||||
/* Now, do some garbage collection. */
|
||||
if (cc->nameqlen > CLIENT_MAXNAMEQLEN) {
|
||||
wn = TAILQ_FIRST(&cc->nameq);
|
||||
assert(wn != NULL);
|
||||
if ((wn = TAILQ_FIRST(&cc->nameq)) == NULL)
|
||||
errx(1, "client_setname: window name queue empty");
|
||||
TAILQ_REMOVE(&cc->nameq, wn, entry);
|
||||
free(wn->name);
|
||||
free(wn);
|
||||
|
5
group.c
5
group.c
@ -22,7 +22,6 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/queue.h>
|
||||
|
||||
#include <assert.h>
|
||||
#include <err.h>
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
@ -264,9 +263,9 @@ group_cycle(struct screen_ctx *sc, int flags)
|
||||
{
|
||||
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 (;;) {
|
||||
gc = (flags & CWM_RCYCLE) ? TAILQ_PREV(gc, group_ctx_q,
|
||||
entry) : TAILQ_NEXT(gc, entry);
|
||||
|
4
search.c
4
search.c
@ -21,7 +21,6 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/queue.h>
|
||||
|
||||
#include <assert.h>
|
||||
#include <err.h>
|
||||
#include <errno.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))
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user