fixed extra warnings dd2f2982
Connor Lane Smith · 2011-05-16 12:59 1 file(s) · +6 −6
dmenu.c +6 −6
135 135
136 136
void
137 137
calcoffsets(void) {
138 -
	unsigned int i, n;
138 +
	int i, n;
139 139
140 140
	if(lines > 0)
141 141
		n = lines * bh;
388 388
match(Bool sub) {
389 389
	size_t len = strlen(text);
390 390
	Item *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
391 -
	Item *item, *next;
391 +
	Item *item, *lnext;
392 392
393 393
	lexact = lprefix = lsubstr = exactend = prefixend = substrend = NULL;
394 -
	for(item = sub ? matches : items; item && item->text; item = next) {
395 -
		next = sub ? item->right : item + 1;
394 +
	for(item = sub ? matches : items; item && item->text; item = lnext) {
395 +
		lnext = sub ? item->right : item + 1;
396 396
		if(!fstrncmp(text, item->text, len + 1))
397 397
			appenditem(item, &lexact, &exactend);
398 398
		else if(!fstrncmp(text, item->text, len))
429 429
nextrune(int incr) {
430 430
	size_t n, len = strlen(text);
431 431
432 -
	for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
432 +
	for(n = cursor + incr; n < len && (text[n] & 0xc0) == 0x80; n += incr);
433 433
	return n;
434 434
}
435 435
442 442
443 443
	XGetWindowProperty(dc->dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
444 444
	                   utf8, &da, &di, &dl, &dl, (unsigned char **)&p);
445 -
	insert(p, (q = strchr(p, '\n')) ? q-p : strlen(p));
445 +
	insert(p, (q = strchr(p, '\n')) ? q-p : (ssize_t)strlen(p));
446 446
	XFree(p);
447 447
	drawmenu();
448 448
}