diff --git a/qdevices/dynar-getopt-lex.c b/qdevices/dynar-getopt-lex.c
index 7eb47599..3ed3a8c9 100644
--- a/qdevices/dynar-getopt-lex.c
+++ b/qdevices/dynar-getopt-lex.c
@@ -1,131 +1,129 @@
 /*
  * Copyright (c) 2015-2016 Red Hat, Inc.
  *
  * All rights reserved.
  *
  * Author: Jan Friesse (jfriesse@redhat.com)
  *
  * This software licensed under BSD license, the text of which follows:
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * - Redistributions of source code must retain the above copyright notice,
  *   this list of conditions and the following disclaimer.
  * - Redistributions in binary form must reproduce the above copyright notice,
  *   this list of conditions and the following disclaimer in the documentation
  *   and/or other materials provided with the distribution.
  * - Neither the name of the Red Hat, Inc. nor the names of its
  *   contributors may be used to endorse or promote products derived from this
  *   software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <string.h>
 
 #include "dynar-getopt-lex.h"
 
 void
 dynar_getopt_lex_init(struct dynar_getopt_lex *lex, struct dynar *input)
 {
 
 	memset(lex, 0, sizeof(*lex));
 	lex->input = input;
 	dynar_init(&lex->option, dynar_max_size(input));
 	dynar_init(&lex->value, dynar_max_size(input));
 }
 
 void
 dynar_getopt_lex_destroy(struct dynar_getopt_lex *lex)
 {
 
 	dynar_destroy(&lex->option);
 	dynar_destroy(&lex->value);
 	memset(lex, 0, sizeof(*lex));
 }
 
 /*
  * 0 - no error
  * -1 - Can't add character
  */
 int
 dynar_getopt_lex_token_next(struct dynar_getopt_lex *lex)
 {
 	size_t pos;
 	size_t size;
 	char *str;
 	char ch;
 	int state;
-	int res;
 
 	dynar_clean(&lex->option);
 	dynar_clean(&lex->value);
 
 	size = dynar_size(lex->input);
 	str = dynar_data(lex->input);
 
 	state = 1;
 	pos = lex->pos;
-	res = 0;
 
 	while (state != 0 && pos < size) {
 		ch = str[pos];
 
 		switch (state) {
 		case 1:
 			/*
 			 * Read option name, wait for = or ,
 			 */
 			if (ch == '=') {
 				pos++;
 				state = 2;
 			} else if (ch == ',') {
 				pos++;
 				state = 0;
 			} else {
 				pos++;
 				if (dynar_cat(&lex->option, &ch, sizeof(ch)) != 0) {
 					return (-1);
 				}
 			}
 			break;
 		case 2:
 			/*
 			 * Wait for end of str or ,
 			 */
 			if (ch == ',') {
 				pos++;
 				state = 0;
 			} else {
 				pos++;
 				if (dynar_cat(&lex->value, &ch, sizeof(ch)) != 0) {
 					return (-1);
 				}
 			}
 			break;
 		}
 	}
 
 	ch = '\0';
 	if (dynar_cat(&lex->option, &ch, sizeof(ch)) != 0) {
 		return (-1);
 	}
 	if (dynar_cat(&lex->value, &ch, sizeof(ch)) != 0) {
 		return (-1);
 	}
 
 	lex->pos = pos;
 
 	return (0);
 }