Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
5c2a8361
Commit
5c2a8361
authored
Aug 16, 2016
by
Patrick Steinhardt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
examples: diff: parse correct types for line-diffopts
parent
7314da10
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
3 deletions
+31
-3
examples/common.c
+19
-0
examples/common.h
+9
-0
examples/diff.c
+3
-3
No files found.
examples/common.c
View file @
5c2a8361
...
@@ -146,6 +146,25 @@ int match_uint16_arg(
...
@@ -146,6 +146,25 @@ int match_uint16_arg(
return
1
;
return
1
;
}
}
int
match_uint32_arg
(
uint32_t
*
out
,
struct
args_info
*
args
,
const
char
*
opt
)
{
const
char
*
found
=
match_numeric_arg
(
args
,
opt
);
uint16_t
val
;
char
*
endptr
=
NULL
;
if
(
!
found
)
return
0
;
val
=
(
uint32_t
)
strtoul
(
found
,
&
endptr
,
0
);
if
(
!
endptr
||
*
endptr
!=
'\0'
)
fatal
(
"expected number after argument"
,
opt
);
if
(
out
)
*
out
=
val
;
return
1
;
}
static
int
match_int_internal
(
static
int
match_int_internal
(
int
*
out
,
const
char
*
str
,
int
allow_negative
,
const
char
*
opt
)
int
*
out
,
const
char
*
str
,
int
allow_negative
,
const
char
*
opt
)
{
{
...
...
examples/common.h
View file @
5c2a8361
...
@@ -73,6 +73,15 @@ extern int match_uint16_arg(
...
@@ -73,6 +73,15 @@ extern int match_uint16_arg(
uint16_t
*
out
,
struct
args_info
*
args
,
const
char
*
opt
);
uint16_t
*
out
,
struct
args_info
*
args
,
const
char
*
opt
);
/**
/**
* Check current `args` entry against `opt` string parsing as uint32. If
* `opt` matches exactly, take the next arg as a uint16_t value; if `opt`
* is a prefix (equal sign optional), take the remainder of the arg as a
* uint32_t value; otherwise return 0.
*/
extern
int
match_uint32_arg
(
uint32_t
*
out
,
struct
args_info
*
args
,
const
char
*
opt
);
/**
* Check current `args` entry against `opt` string parsing as int. If
* Check current `args` entry against `opt` string parsing as int. If
* `opt` matches exactly, take the next arg as an int value; if it matches
* `opt` matches exactly, take the next arg as an int value; if it matches
* as a prefix (equal sign optional), take the remainder of the arg as a
* as a prefix (equal sign optional), take the remainder of the arg as a
...
...
examples/diff.c
View file @
5c2a8361
...
@@ -293,11 +293,11 @@ static void parse_opts(struct opts *o, int argc, char *argv[])
...
@@ -293,11 +293,11 @@ static void parse_opts(struct opts *o, int argc, char *argv[])
else
if
(
is_prefixed
(
a
,
"-B"
)
||
is_prefixed
(
a
,
"--break-rewrites"
))
else
if
(
is_prefixed
(
a
,
"-B"
)
||
is_prefixed
(
a
,
"--break-rewrites"
))
/* TODO: parse thresholds */
/* TODO: parse thresholds */
o
->
findopts
.
flags
|=
GIT_DIFF_FIND_REWRITES
;
o
->
findopts
.
flags
|=
GIT_DIFF_FIND_REWRITES
;
else
if
(
!
match_uint
16
_arg
(
else
if
(
!
match_uint
32
_arg
(
&
o
->
diffopts
.
context_lines
,
&
args
,
"-U"
)
&&
&
o
->
diffopts
.
context_lines
,
&
args
,
"-U"
)
&&
!
match_uint
16
_arg
(
!
match_uint
32
_arg
(
&
o
->
diffopts
.
context_lines
,
&
args
,
"--unified"
)
&&
&
o
->
diffopts
.
context_lines
,
&
args
,
"--unified"
)
&&
!
match_uint
16
_arg
(
!
match_uint
32
_arg
(
&
o
->
diffopts
.
interhunk_lines
,
&
args
,
"--inter-hunk-context"
)
&&
&
o
->
diffopts
.
interhunk_lines
,
&
args
,
"--inter-hunk-context"
)
&&
!
match_uint16_arg
(
!
match_uint16_arg
(
&
o
->
diffopts
.
id_abbrev
,
&
args
,
"--abbrev"
)
&&
&
o
->
diffopts
.
id_abbrev
,
&
args
,
"--abbrev"
)
&&
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment