trinity/src
1
0
Fork 0
Code

use array for items

Browse Source
This commit is contained in:
Connor Lane Smith 2011-05-14 17:46:20 +01:00
parent ce9295cb8e
commit 6f9896a5c2
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dmenubar/dmenu.c
View File

@ -1,4 +1,4 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copynext and license details. */
#include <ctype.h> #include <ctype.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -19,8 +19,7 @@
typedef struct Item Item; typedef struct Item Item;
struct Item { struct Item {
char *text; char *text;
Item *next; /* traverses all items */ Item *left, *right;
Item *left, *right; /* traverses matching items */
}; };
static void appenditem(Item *item, Item **list, Item **last); static void appenditem(Item *item, Item **list, Item **last);
@ -386,7 +385,7 @@ match(void) {
len = strlen(text); len = strlen(text);
matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL; matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
for(item = items; item; item = item->next) for(item = items; item && item->text; item++)
if(!fstrncmp(text, item->text, len + 1)) if(!fstrncmp(text, item->text, len + 1))
appenditem(item, &lexact, &exactend); appenditem(item, &lexact, &exactend);
else if(!fstrncmp(text, item->text, len)) else if(!fstrncmp(text, item->text, len))
@ -445,16 +444,17 @@ paste(void) {
void void
readstdin(void) { readstdin(void) {
char buf[sizeof text], *p; char buf[sizeof text], *p;
Item *item, **end; size_t i, size = 0;
for(end = &items; fgets(buf, sizeof buf, stdin); *end = item, end = &item->next) { for(i = 0; fgets(buf, sizeof buf, stdin); items[++i].text = NULL) {
if(i+1 == size / sizeof *items || !items)
if(!(items = realloc(items, (size += BUFSIZ))))
eprintf("cannot realloc %u bytes:", size);
if((p = strchr(buf, '\n'))) if((p = strchr(buf, '\n')))
*p = '\0'; *p = '\0';
if(!(item = calloc(1, sizeof *item))) if(!(items[i].text = strdup(buf)))
eprintf("cannot malloc %u bytes:", sizeof *item);
if(!(item->text = strdup(buf)))
eprintf("cannot strdup %u bytes:", strlen(buf)+1); eprintf("cannot strdup %u bytes:", strlen(buf)+1);
inputw = MAX(inputw, textw(dc, item->text)); inputw = MAX(inputw, textw(dc, items[i].text));
} }
} }