projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upload doc+dox script
[yaz-moved-to-github.git]
/
src
/
options.c
diff --git
a/src/options.c
b/src/options.c
index
35f4e6f
..
8490e99
100644
(file)
--- a/
src/options.c
+++ b/
src/options.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2009 Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-20,7
+20,7
@@
static int arg_off = 0;
int options (const char *desc, char **argv, int argc, char **arg)
{
const char *opt_buf = 0;
int options (const char *desc, char **argv, int argc, char **arg)
{
const char *opt_buf = 0;
- int i = 0;
+ size_t i = 0;
int ch = 0;
if (arg_no >= argc)
int ch = 0;
if (arg_no >= argc)
@@
-55,7
+55,7
@@
int options (const char *desc, char **argv, int argc, char **arg)
int type = 0;
while (desc[i] == '{')
{
int type = 0;
while (desc[i] == '{')
{
- int i0 = ++i;
+ size_t i0 = ++i;
while (desc[i] && desc[i] != '}')
i++;
if (opt_buf && (i - i0) == strlen(opt_buf) &&
while (desc[i] && desc[i] != '}')
i++;
if (opt_buf && (i - i0) == strlen(opt_buf) &&
@@
-66,7
+66,7
@@
int options (const char *desc, char **argv, int argc, char **arg)
}
if (desc[i] == ':')
{ /* option with string argument */
}
if (desc[i] == ':')
{ /* option with string argument */
- type = desc[i++];
+ type = desc[i++];
}
if (desc_char == ch)
{
}
if (desc_char == ch)
{
@@
-90,9
+90,7
@@
int options (const char *desc, char **argv, int argc, char **arg)
}
else /* option with no argument */
{
}
else /* option with no argument */
{
- if (argv[arg_no][arg_off])
- arg_off++;
- else
+ if (!argv[arg_no][arg_off])
{
arg_off = 0;
arg_no++;
{
arg_off = 0;
arg_no++;
@@
-109,6
+107,7
@@
int options (const char *desc, char **argv, int argc, char **arg)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab