unsigned integers and size_t
Use "unsigned int" whenever negative values are not meaningful. Use size_t whenever we are going to describe buffer sizes.
This commit is contained in:
		@@ -25,7 +25,6 @@
 | 
				
			|||||||
#include "charConv.h"
 | 
					#include "charConv.h"
 | 
				
			||||||
#include "tagTracker.h"
 | 
					#include "tagTracker.h"
 | 
				
			||||||
#include "song.h"
 | 
					#include "song.h"
 | 
				
			||||||
#include "os_compat.h"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef HAVE_ID3TAG
 | 
					#ifdef HAVE_ID3TAG
 | 
				
			||||||
#  define isId3v1(tag) (id3_tag_options(tag, 0, 0) & ID3_TAG_OPTION_ID3V1)
 | 
					#  define isId3v1(tag) (id3_tag_options(tag, 0, 0) & ID3_TAG_OPTION_ID3V1)
 | 
				
			||||||
@@ -698,9 +697,9 @@ int mpdTagsAreEqual(MpdTag * tag1, MpdTag * tag2)
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void appendToTagItems(MpdTag * tag, enum tag_type type,
 | 
					static void appendToTagItems(MpdTag * tag, enum tag_type type,
 | 
				
			||||||
			     char *value, int len)
 | 
								     char *value, size_t len)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	int i = tag->numOfItems;
 | 
						unsigned int i = tag->numOfItems;
 | 
				
			||||||
	char *duplicated = xmalloc(len + 1);
 | 
						char *duplicated = xmalloc(len + 1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	memcpy(duplicated, value, len);
 | 
						memcpy(duplicated, value, len);
 | 
				
			||||||
@@ -719,7 +718,7 @@ static void appendToTagItems(MpdTag * tag, enum tag_type type,
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void addItemToMpdTagWithLen(MpdTag * tag, enum tag_type itemType,
 | 
					void addItemToMpdTagWithLen(MpdTag * tag, enum tag_type itemType,
 | 
				
			||||||
			    char *value, int len)
 | 
								    char *value, size_t len)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	if (ignoreTagItems[itemType])
 | 
						if (ignoreTagItems[itemType])
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,6 +22,7 @@
 | 
				
			|||||||
#include "../config.h"
 | 
					#include "../config.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "mpd_types.h"
 | 
					#include "mpd_types.h"
 | 
				
			||||||
 | 
					#include "os_compat.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef HAVE_ID3TAG
 | 
					#ifdef HAVE_ID3TAG
 | 
				
			||||||
#include <id3tag.h>
 | 
					#include <id3tag.h>
 | 
				
			||||||
@@ -72,7 +73,7 @@ void clearItemsFromMpdTag(MpdTag * tag, enum tag_type itemType);
 | 
				
			|||||||
void freeMpdTag(MpdTag * tag);
 | 
					void freeMpdTag(MpdTag * tag);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void addItemToMpdTagWithLen(MpdTag * tag, enum tag_type itemType,
 | 
					void addItemToMpdTagWithLen(MpdTag * tag, enum tag_type itemType,
 | 
				
			||||||
			    char *value, int len);
 | 
								    char *value, size_t len);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define addItemToMpdTag(tag, itemType, value) \
 | 
					#define addItemToMpdTag(tag, itemType, value) \
 | 
				
			||||||
		addItemToMpdTagWithLen(tag, itemType, value, strlen(value))
 | 
							addItemToMpdTagWithLen(tag, itemType, value, strlen(value))
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										12
									
								
								src/utf8.c
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								src/utf8.c
									
									
									
									
									
								
							@@ -69,7 +69,7 @@ static char utf8_to_latin1_char(const char *inUtf8)
 | 
				
			|||||||
	return (char)(c + utf8[1]);
 | 
						return (char)(c + utf8[1]);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int validateUtf8Char(const char *inUtf8Char)
 | 
					static unsigned int validateUtf8Char(const char *inUtf8Char)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	const unsigned char *utf8Char = (const unsigned char *)inUtf8Char;
 | 
						const unsigned char *utf8Char = (const unsigned char *)inUtf8Char;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -77,9 +77,9 @@ static int validateUtf8Char(const char *inUtf8Char)
 | 
				
			|||||||
		return 1;
 | 
							return 1;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (utf8Char[0] >= 0xC0 && utf8Char[0] <= 0xFD) {
 | 
						if (utf8Char[0] >= 0xC0 && utf8Char[0] <= 0xFD) {
 | 
				
			||||||
		int count = 1;
 | 
							unsigned int count = 1;
 | 
				
			||||||
		char t = 1 << 5;
 | 
							char t = 1 << 5;
 | 
				
			||||||
		int i;
 | 
							unsigned int i;
 | 
				
			||||||
		while (count < 6 && (t & utf8Char[0])) {
 | 
							while (count < 6 && (t & utf8Char[0])) {
 | 
				
			||||||
			t = (t >> 1);
 | 
								t = (t >> 1);
 | 
				
			||||||
			count++;
 | 
								count++;
 | 
				
			||||||
@@ -97,7 +97,7 @@ static int validateUtf8Char(const char *inUtf8Char)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
int validUtf8String(const char *string)
 | 
					int validUtf8String(const char *string)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	int ret;
 | 
						unsigned int ret;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	while (*string) {
 | 
						while (*string) {
 | 
				
			||||||
		ret = validateUtf8Char(string);
 | 
							ret = validateUtf8Char(string);
 | 
				
			||||||
@@ -114,7 +114,7 @@ char *utf8StrToLatin1Dup(const char *utf8)
 | 
				
			|||||||
	/* utf8 should have at most two char's per latin1 char */
 | 
						/* utf8 should have at most two char's per latin1 char */
 | 
				
			||||||
	char *ret = xmalloc(strlen(utf8) + 1);
 | 
						char *ret = xmalloc(strlen(utf8) + 1);
 | 
				
			||||||
	char *cp = ret;
 | 
						char *cp = ret;
 | 
				
			||||||
	int count;
 | 
						unsigned int count;
 | 
				
			||||||
	size_t len = 0;
 | 
						size_t len = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	while (*utf8) {
 | 
						while (*utf8) {
 | 
				
			||||||
@@ -136,7 +136,7 @@ char *utf8StrToLatin1Dup(const char *utf8)
 | 
				
			|||||||
char *utf8_to_latin1(char *dest, const char *utf8)
 | 
					char *utf8_to_latin1(char *dest, const char *utf8)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	char *cp = dest;
 | 
						char *cp = dest;
 | 
				
			||||||
	int count;
 | 
						unsigned int count;
 | 
				
			||||||
	size_t len = 0;
 | 
						size_t len = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	while (*utf8) {
 | 
						while (*utf8) {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user