summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFRIGN <dev@frign.de>2015-09-28 00:15:03 +0200
committerHiltjo Posthuma <hiltjo@codemadness.org>2015-09-28 00:33:26 +0200
commit10fd4f275feaef0b505cc8e65a2deccae69a0968 (patch)
treed85ca9b6d89f98c0db6ebb9d9d93ba0eb8127c2a
parentb048eacc9ddc6ca995783411d4df84c23f3a0351 (diff)
Untypedef struct item
Adds clarity. Typedefs for structs are definitely a discussion matter, but there's no reason to hide a simple data-structure behind a meaningless typedef.
-rw-r--r--dmenu.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/dmenu.c b/dmenu.c
index cf5d976..050b858 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -28,14 +28,13 @@
/* enums */
enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
-typedef struct Item Item;
-struct Item {
+struct item {
char *text;
- Item *left, *right;
+ struct item *left, *right;
bool out;
};
-static void appenditem(Item *, Item **, Item **);
+static void appenditem(struct item *, struct item **, struct item **);
static void calcoffsets(void);
static char *cistrstr(const char *, const char *);
static void cleanup(void);
@@ -56,9 +55,9 @@ static int bh, mw, mh;
static int sw, sh; /* X display screen geometry width, height */
static int inputw, promptw;
static size_t cursor;
-static Item *items = NULL;
-static Item *matches, *matchend;
-static Item *prev, *curr, *next, *sel;
+static struct item *items = NULL;
+static struct item *matches, *matchend;
+static struct item *prev, *curr, *next, *sel;
static int mon = -1, screen;
static Atom clip, utf8;
@@ -75,7 +74,7 @@ static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
static char *(*fstrstr)(const char *, const char *) = strstr;
static void
-appenditem(Item *item, Item **list, Item **last)
+appenditem(struct item *item, struct item **list, struct item **last)
{
if (*last)
(*last)->right = item;
@@ -135,7 +134,7 @@ static void
drawmenu(void)
{
int curpos;
- Item *item;
+ struct item *item;
int x = 0, y = 0, h = bh, w;
drw_setscheme(drw, &scheme[SchemeNorm]);
@@ -408,7 +407,7 @@ match(void)
char buf[sizeof text], *s;
int i, tokc = 0;
size_t len;
- Item *item, *lprefix, *lsubstr, *prefixend, *substrend;
+ struct item *item, *lprefix, *lsubstr, *prefixend, *substrend;
strcpy(buf, text);
/* separate input text into tokens to be matched individually */