minor fixes to sane-desc.c

- memleaks on error paths
- whitspaces at end of line
merge-requests/1/head
Stphane Voltz 2013-02-11 07:55:43 +01:00
rodzic 8f3983ed20
commit e7804700f6
2 zmienionych plików z 52 dodań i 41 usunięć

Wyświetl plik

@ -1,3 +1,6 @@
2013-02-11 Stéphane Voltz <stef.dev@free.fr>
* tools/sane-desc.c: fix minor memleaks and whitespace at end of line.
2013-02-09 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma.c, backend/pixma_mp750.c, backend/pixma_mp810.c,
backend/pixma_sane_options.c: fixed compiler warnings.

Wyświetl plik

@ -616,7 +616,10 @@ read_keyword (SANE_String line, SANE_String keyword_token,
}
if (strcmp (word, keyword_token) != 0)
{
free(word);
return SANE_STATUS_INVAL;
}
free (word);
word = 0;
@ -651,6 +654,7 @@ read_keyword (SANE_String line, SANE_String keyword_token,
cp = get_token (cp, &word);
if (!word)
{
free(strings);
DBG_ERR ("read_keyword: missing quotation mark: %s\n", line);
return SANE_STATUS_INVAL;
}
@ -666,6 +670,7 @@ read_keyword (SANE_String line, SANE_String keyword_token,
cp = get_token (cp, &word);
if (!word)
{
free(strings);
DBG_ERR ("read_keyword: missing quotation mark: %s\n", line);
return SANE_STATUS_INVAL;
}
@ -686,6 +691,7 @@ read_keyword (SANE_String line, SANE_String keyword_token,
cp = get_token (cp, &word);
if (!word)
{
free(strings);
DBG_ERR ("read_keyword: missing quotation mark: %s\n", line);
return SANE_STATUS_INVAL;
}
@ -701,6 +707,7 @@ read_keyword (SANE_String line, SANE_String keyword_token,
cp = get_token (cp, &word);
if (!word)
{
free(strings);
DBG_ERR ("read_keyword: missing quotation mark: %s\n", line);
return SANE_STATUS_INVAL;
}
@ -716,6 +723,7 @@ read_keyword (SANE_String line, SANE_String keyword_token,
cp = get_token (cp, &word);
if (!word)
{
free(strings);
DBG_ERR ("read_keyword: missing quotation mark: %s\n", line);
return SANE_STATUS_INVAL;
}