increment version

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index b6f1ef2..40b220c 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -66,7 +66,6 @@ main(int argc, char *argv[]) {
        Bool fast = False;
        int i;
 
        Bool fast = False;
        int i;
 

-       progname = "dmenu";

        for(i = 1; i < argc; i++)
                /* single flags */
                if(!strcmp(argv[i], "-v")) {
        for(i = 1; i < argc; i++)
                /* single flags */
                if(!strcmp(argv[i], "-v")) {


@@ -383,10 +382,9 @@ keypress(XKeyEvent *ev) {
 
 void
 match(void) {
 
 void
 match(void) {

-       size_t len;
+       size_t len = strlen(text);

        Item *item, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
 
        Item *item, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
 

-       len = strlen(text);

        matches = lexact = lprefix = lsubstr = matchend = exactend = prefixend = substrend = NULL;
        for(item = items; item && item->text; item++)
                if(!fstrncmp(text, item->text, len + 1))
        matches = lexact = lprefix = lsubstr = matchend = exactend = prefixend = substrend = NULL;
        for(item = items; item && item->text; item++)
                if(!fstrncmp(text, item->text, len + 1))


@@ -424,9 +422,8 @@ match(void) {
 
 size_t
 nextrune(int incr) {
 
 size_t
 nextrune(int incr) {

-       size_t n, len;
+       size_t n, len = strlen(text);

 
 

-       len = strlen(text);

        for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
        return n;
 }
        for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
        return n;
 }