[asterisk-commits] qwell: trunk r80429 - /trunk/main/minimime/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Aug 22 18:26:02 CDT 2007
Author: qwell
Date: Wed Aug 22 18:26:02 2007
New Revision: 80429
URL: http://svn.digium.com/view/asterisk?view=rev&rev=80429
Log:
Convert minimime to use the proper uint*_t types, rather than u_int*_t
Modified:
trunk/main/minimime/mm.h
trunk/main/minimime/mm_base64.c
trunk/main/minimime/mm_codecs.c
trunk/main/minimime/mm_mem.h
trunk/main/minimime/mm_util.c
Modified: trunk/main/minimime/mm.h
URL: http://svn.digium.com/view/asterisk/trunk/main/minimime/mm.h?view=diff&rev=80429&r1=80428&r2=80429
==============================================================================
--- trunk/main/minimime/mm.h (original)
+++ trunk/main/minimime/mm.h Wed Aug 22 18:26:02 2007
@@ -155,7 +155,7 @@
struct mm_warning
{
enum mm_warning_code warning;
- u_int32_t lineno;
+ uint32_t lineno;
SLIST_ENTRY(mm_warning) next;
};
@@ -167,7 +167,7 @@
enum mm_encoding id;
char *encoding;
- char *(*encoder)(char *, u_int32_t);
+ char *(*encoder)(char *, uint32_t);
char *(*decoder)(char *);
SLIST_ENTRY(mm_codec) next;
@@ -251,7 +251,7 @@
char *mm_unquote(const char *);
char *mm_uncomment(const char *);
char *mm_stripchars(char *, char *);
-char *mm_addchars(char *, char *, u_int16_t);
+char *mm_addchars(char *, char *, uint16_t);
int mm_gendate(char **);
void mm_striptrailing(char **, const char *);
int mm_mimeutil_genboundary(char *, size_t, char **);
@@ -337,13 +337,13 @@
int mm_codec_isregistered(const char *);
int mm_codec_hasdecoder(const char *);
int mm_codec_hasencoder(const char *);
-int mm_codec_register(const char *, char *(*encoder)(char *, u_int32_t), char *(*decoder)(char *));
+int mm_codec_register(const char *, char *(*encoder)(char *, uint32_t), char *(*decoder)(char *));
int mm_codec_unregister(const char *);
int mm_codec_unregisterall(void);
void mm_codec_registerdefaultcodecs(void);
char *mm_base64_decode(char *);
-char *mm_base64_encode(char *, u_int32_t);
+char *mm_base64_encode(char *, uint32_t);
void mm_error_init(void);
void mm_error_setmsg(const char *, ...);
Modified: trunk/main/minimime/mm_base64.c
URL: http://svn.digium.com/view/asterisk/trunk/main/minimime/mm_base64.c?view=diff&rev=80429&r1=80428&r2=80429
==============================================================================
--- trunk/main/minimime/mm_base64.c (original)
+++ trunk/main/minimime/mm_base64.c Wed Aug 22 18:26:02 2007
@@ -41,7 +41,7 @@
#define XX 127
static int _mm_base64_decode(char *);
-static char *_mm_base64_encode(char *, u_int32_t);
+static char *_mm_base64_encode(char *, uint32_t);
/*
* Tables for encoding/decoding base64
@@ -103,7 +103,7 @@
*
*/
char *
-mm_base64_encode(char *data, u_int32_t len) {
+mm_base64_encode(char *data, uint32_t len) {
char *buf;
char *ret;
@@ -125,7 +125,7 @@
static int
_mm_base64_decode(char *input)
{
- u_int32_t len = 0;
+ uint32_t len = 0;
unsigned char *output = (unsigned char *)input;
int c1, c2, c3, c4;
@@ -158,14 +158,14 @@
* caller must free the space.
*/
static char *
-_mm_base64_encode(char *data, u_int32_t len)
+_mm_base64_encode(char *data, uint32_t len)
{
char *buf;
- u_int32_t buflen;
+ uint32_t buflen;
int c1;
int c2;
int c3;
- u_int32_t maxbuf;
+ uint32_t maxbuf;
buflen = 0;
Modified: trunk/main/minimime/mm_codecs.c
URL: http://svn.digium.com/view/asterisk/trunk/main/minimime/mm_codecs.c?view=diff&rev=80429&r1=80428&r2=80429
==============================================================================
--- trunk/main/minimime/mm_codecs.c (original)
+++ trunk/main/minimime/mm_codecs.c Wed Aug 22 18:26:02 2007
@@ -150,7 +150,7 @@
*/
int
mm_codec_register(const char *encoding,
- char *(*encoder)(char *data, u_int32_t i),
+ char *(*encoder)(char *data, uint32_t i),
char *(*decoder)(char *data))
{
struct mm_codec *codec;
Modified: trunk/main/minimime/mm_mem.h
URL: http://svn.digium.com/view/asterisk/trunk/main/minimime/mm_mem.h?view=diff&rev=80429&r1=80428&r2=80429
==============================================================================
--- trunk/main/minimime/mm_mem.h (original)
+++ trunk/main/minimime/mm_mem.h Wed Aug 22 18:26:02 2007
@@ -14,7 +14,7 @@
struct MM_mem_chunk {
void *address;
const char *filename;
- u_int32_t line;
+ uint32_t line;
size_t size;
TAILQ_ENTRY(MM_mem_chunk) next;
Modified: trunk/main/minimime/mm_util.c
URL: http://svn.digium.com/view/asterisk/trunk/main/minimime/mm_util.c?view=diff&rev=80429&r1=80428&r2=80429
==============================================================================
--- trunk/main/minimime/mm_util.c (original)
+++ trunk/main/minimime/mm_util.c Wed Aug 22 18:26:02 2007
@@ -353,13 +353,13 @@
* returns this new string.
*/
char *
-mm_addchars(char *input, char *add, u_int16_t linelength)
-{
- u_int32_t len;
- u_int32_t i;
- u_int32_t l;
- u_int32_t j;
- u_int16_t addcrlf;
+mm_addchars(char *input, char *add, uint16_t linelength)
+{
+ uint32_t len;
+ uint32_t i;
+ uint32_t l;
+ uint32_t j;
+ uint16_t addcrlf;
char *output;
char *orig;
More information about the asterisk-commits
mailing list