Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
e7c267db
Commit
e7c267db
authored
Oct 18, 2009
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
command: use GLib limit macros in check_range()
These are portable and don't require limits.h.
parent
6a5e7c11
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
command.c
src/command.c
+10
-10
No files found.
src/command.c
View file @
e7c267db
...
@@ -167,8 +167,8 @@ check_int(struct client *client, int *value_r,
...
@@ -167,8 +167,8 @@ check_int(struct client *client, int *value_r,
return
false
;
return
false
;
}
}
#if
LONG_MAX > INT_MAX
#if
G_MAXLONG > G_MAXINT
if
(
value
<
INT_MIN
||
value
>
INT_MAX
)
{
if
(
value
<
G_MININT
||
value
>
G_MAXINT
)
{
command_error
(
client
,
ACK_ERROR_ARG
,
command_error
(
client
,
ACK_ERROR_ARG
,
"Number too large: %s"
,
s
);
"Number too large: %s"
,
s
);
return
false
;
return
false
;
...
@@ -199,7 +199,7 @@ check_range(struct client *client, unsigned *value_r1, unsigned *value_r2,
...
@@ -199,7 +199,7 @@ check_range(struct client *client, unsigned *value_r1, unsigned *value_r2,
/* compatibility with older MPD versions: specifying
/* compatibility with older MPD versions: specifying
"-1" makes MPD display the whole list */
"-1" makes MPD display the whole list */
*
value_r1
=
0
;
*
value_r1
=
0
;
*
value_r2
=
UINT_MAX
;
*
value_r2
=
G_MAXUINT
;
return
true
;
return
true
;
}
}
...
@@ -209,8 +209,8 @@ check_range(struct client *client, unsigned *value_r1, unsigned *value_r2,
...
@@ -209,8 +209,8 @@ check_range(struct client *client, unsigned *value_r1, unsigned *value_r2,
return
false
;
return
false
;
}
}
#if
LONG_MAX > UINT_MAX
#if
G_MAXLONG > G_MAXUINT
if
(
value
>
UINT_MAX
)
{
if
(
value
>
G_MAXUINT
)
{
command_error
(
client
,
ACK_ERROR_ARG
,
command_error
(
client
,
ACK_ERROR_ARG
,
"Number too large: %s"
,
s
);
"Number too large: %s"
,
s
);
return
false
;
return
false
;
...
@@ -235,8 +235,8 @@ check_range(struct client *client, unsigned *value_r1, unsigned *value_r2,
...
@@ -235,8 +235,8 @@ check_range(struct client *client, unsigned *value_r1, unsigned *value_r2,
return
false
;
return
false
;
}
}
#if
LONG_MAX > UINT_MAX
#if
G_MAXLONG > G_MAXUINT
if
(
value
>
UINT_MAX
)
{
if
(
value
>
G_MAXUINT
)
{
command_error
(
client
,
ACK_ERROR_ARG
,
command_error
(
client
,
ACK_ERROR_ARG
,
"Number too large: %s"
,
s
);
"Number too large: %s"
,
s
);
return
false
;
return
false
;
...
@@ -263,7 +263,7 @@ check_unsigned(struct client *client, unsigned *value_r, const char *s)
...
@@ -263,7 +263,7 @@ check_unsigned(struct client *client, unsigned *value_r, const char *s)
return
false
;
return
false
;
}
}
if
(
value
>
UINT_MAX
)
{
if
(
value
>
G_MAXUINT
)
{
command_error
(
client
,
ACK_ERROR_ARG
,
command_error
(
client
,
ACK_ERROR_ARG
,
"Number too large: %s"
,
s
);
"Number too large: %s"
,
s
);
return
false
;
return
false
;
...
@@ -823,7 +823,7 @@ handle_plchangesposid(struct client *client, G_GNUC_UNUSED int argc, char *argv[
...
@@ -823,7 +823,7 @@ handle_plchangesposid(struct client *client, G_GNUC_UNUSED int argc, char *argv[
static
enum
command_return
static
enum
command_return
handle_playlistinfo
(
struct
client
*
client
,
int
argc
,
char
*
argv
[])
handle_playlistinfo
(
struct
client
*
client
,
int
argc
,
char
*
argv
[])
{
{
unsigned
start
=
0
,
end
=
UINT_MAX
;
unsigned
start
=
0
,
end
=
G_MAXUINT
;
bool
ret
;
bool
ret
;
if
(
argc
==
2
&&
!
check_range
(
client
,
&
start
,
&
end
,
if
(
argc
==
2
&&
!
check_range
(
client
,
&
start
,
&
end
,
...
@@ -852,7 +852,7 @@ handle_playlistid(struct client *client, int argc, char *argv[])
...
@@ -852,7 +852,7 @@ handle_playlistid(struct client *client, int argc, char *argv[])
return
print_playlist_result
(
client
,
return
print_playlist_result
(
client
,
PLAYLIST_RESULT_NO_SUCH_SONG
);
PLAYLIST_RESULT_NO_SUCH_SONG
);
}
else
{
}
else
{
playlist_print_info
(
client
,
&
g_playlist
,
0
,
UINT_MAX
);
playlist_print_info
(
client
,
&
g_playlist
,
0
,
G_MAXUINT
);
}
}
return
COMMAND_RETURN_OK
;
return
COMMAND_RETURN_OK
;
...
...
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