Commit 1d97bbbd authored by Max Kellermann's avatar Max Kellermann Committed by Eric Wong

unsigned counters

Use unsigned variables for storing the count of items or for iteration variables. Since there can never be a negative number of items, it makes sense to use an unsigned data type here. This change is safe because the unsigned values are only used for adddressing array items. git-svn-id: https://svn.musicpd.org/mpd/trunk@7214 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent e4779fa7
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#define INTERFACE_MAX_OUTPUT_BUFFER_SIZE_DEFAULT (8192*1024) #define INTERFACE_MAX_OUTPUT_BUFFER_SIZE_DEFAULT (8192*1024)
/* set this to zero to indicate we have no possible interfaces */ /* set this to zero to indicate we have no possible interfaces */
static int interface_max_connections; /*INTERFACE_MAX_CONNECTIONS_DEFAULT; */ static unsigned int interface_max_connections; /*INTERFACE_MAX_CONNECTIONS_DEFAULT; */
static int interface_timeout = INTERFACE_TIMEOUT_DEFAULT; static int interface_timeout = INTERFACE_TIMEOUT_DEFAULT;
static size_t interface_max_command_list_size = static size_t interface_max_command_list_size =
INTERFACE_MAX_COMMAND_LIST_DEFAULT; INTERFACE_MAX_COMMAND_LIST_DEFAULT;
...@@ -73,7 +73,7 @@ typedef struct _Interface { ...@@ -73,7 +73,7 @@ typedef struct _Interface {
size_t deferred_bytes; /* mem deferred_send consumes */ size_t deferred_bytes; /* mem deferred_send consumes */
int expired; /* set whether this interface should be closed on next int expired; /* set whether this interface should be closed on next
check of old interfaces */ check of old interfaces */
int num; /* interface number */ unsigned int num; /* interface number */
char *send_buf; char *send_buf;
size_t send_buf_used; /* bytes used this instance */ size_t send_buf_used; /* bytes used this instance */
...@@ -237,7 +237,7 @@ static void closeInterface(Interface * interface) ...@@ -237,7 +237,7 @@ static void closeInterface(Interface * interface)
void openAInterface(int fd, struct sockaddr *addr) void openAInterface(int fd, struct sockaddr *addr)
{ {
int i; unsigned int i;
for (i = 0; i < interface_max_connections for (i = 0; i < interface_max_connections
&& interfaces[i].fd >= 0; i++) /* nothing */ ; && interfaces[i].fd >= 0; i++) /* nothing */ ;
...@@ -421,7 +421,7 @@ static int interfaceReadInput(Interface * interface) ...@@ -421,7 +421,7 @@ static int interfaceReadInput(Interface * interface)
static void addInterfacesReadyToReadAndListenSocketToFdSet(fd_set * fds, static void addInterfacesReadyToReadAndListenSocketToFdSet(fd_set * fds,
int *fdmax) int *fdmax)
{ {
int i; unsigned int i;
FD_ZERO(fds); FD_ZERO(fds);
addListenSocketsToFdSet(fds, fdmax); addListenSocketsToFdSet(fds, fdmax);
...@@ -438,7 +438,7 @@ static void addInterfacesReadyToReadAndListenSocketToFdSet(fd_set * fds, ...@@ -438,7 +438,7 @@ static void addInterfacesReadyToReadAndListenSocketToFdSet(fd_set * fds,
static void addInterfacesForBufferFlushToFdSet(fd_set * fds, int *fdmax) static void addInterfacesForBufferFlushToFdSet(fd_set * fds, int *fdmax)
{ {
int i; unsigned int i;
FD_ZERO(fds); FD_ZERO(fds);
...@@ -456,7 +456,7 @@ static void closeNextErroredInterface(void) ...@@ -456,7 +456,7 @@ static void closeNextErroredInterface(void)
{ {
fd_set fds; fd_set fds;
struct timeval tv; struct timeval tv;
int i; unsigned int i;
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 0; tv.tv_usec = 0;
...@@ -478,7 +478,7 @@ int doIOForInterfaces(void) ...@@ -478,7 +478,7 @@ int doIOForInterfaces(void)
fd_set rfds; fd_set rfds;
fd_set wfds; fd_set wfds;
fd_set efds; fd_set efds;
int i; unsigned int i;
int selret; int selret;
int fdmax; int fdmax;
...@@ -532,7 +532,7 @@ int doIOForInterfaces(void) ...@@ -532,7 +532,7 @@ int doIOForInterfaces(void)
void initInterfaces(void) void initInterfaces(void)
{ {
int i; unsigned int i;
char *test; char *test;
ConfigParam *param; ConfigParam *param;
...@@ -597,7 +597,7 @@ void initInterfaces(void) ...@@ -597,7 +597,7 @@ void initInterfaces(void)
static void closeAllInterfaces(void) static void closeAllInterfaces(void)
{ {
int i; unsigned int i;
for (i = 0; i < interface_max_connections; i++) { for (i = 0; i < interface_max_connections; i++) {
if (interfaces[i].fd >= 0) if (interfaces[i].fd >= 0)
...@@ -619,7 +619,7 @@ void freeAllInterfaces(void) ...@@ -619,7 +619,7 @@ void freeAllInterfaces(void)
void closeOldInterfaces(void) void closeOldInterfaces(void)
{ {
int i; unsigned int i;
for (i = 0; i < interface_max_connections; i++) { for (i = 0; i < interface_max_connections; i++) {
if (interfaces[i].fd >= 0) { if (interfaces[i].fd >= 0) {
...@@ -685,7 +685,7 @@ static void flushInterfaceBuffer(Interface * interface) ...@@ -685,7 +685,7 @@ static void flushInterfaceBuffer(Interface * interface)
int interfacePrintWithFD(int fd, char *buffer, size_t buflen) int interfacePrintWithFD(int fd, char *buffer, size_t buflen)
{ {
static int i; static unsigned int i;
size_t copylen; size_t copylen;
Interface *interface; Interface *interface;
......
...@@ -50,7 +50,7 @@ static void get_state_file_path(void) ...@@ -50,7 +50,7 @@ static void get_state_file_path(void)
void write_state_file(void) void write_state_file(void)
{ {
int i; unsigned int i;
FILE *fp; FILE *fp;
if (!sfpath) if (!sfpath)
...@@ -72,7 +72,7 @@ void write_state_file(void) ...@@ -72,7 +72,7 @@ void write_state_file(void)
void read_state_file(void) void read_state_file(void)
{ {
struct stat st; struct stat st;
int i; unsigned int i;
FILE *fp; FILE *fp;
get_state_file_path(); get_state_file_path();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment