mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 11:58:52 +00:00
Convert minimime to use the proper uint*_t types, rather than u_int*_t
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80429 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -155,7 +155,7 @@ enum mm_warning_code
|
||||
struct mm_warning
|
||||
{
|
||||
enum mm_warning_code warning;
|
||||
u_int32_t lineno;
|
||||
uint32_t lineno;
|
||||
SLIST_ENTRY(mm_warning) next;
|
||||
};
|
||||
|
||||
@@ -167,7 +167,7 @@ struct mm_codec
|
||||
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 @@ typedef struct mm_context mm_ctx_t;
|
||||
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 @@ char *mm_flatten_context(MM_CTX *);
|
||||
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 *, ...);
|
||||
|
@@ -41,7 +41,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
#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 @@ mm_base64_decode(char *data)
|
||||
*
|
||||
*/
|
||||
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 @@ mm_base64_encode(char *data, u_int32_t len) {
|
||||
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 @@ _mm_base64_decode(char *input)
|
||||
* 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;
|
||||
|
||||
|
@@ -150,7 +150,7 @@ mm_codec_isregistered(const char *encoding)
|
||||
*/
|
||||
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;
|
||||
|
@@ -14,7 +14,7 @@ TAILQ_HEAD(MM_chunks, MM_mem_chunk);
|
||||
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;
|
||||
|
@@ -353,13 +353,13 @@ mm_stripchars(char *input, char *strip)
|
||||
* returns this new string.
|
||||
*/
|
||||
char *
|
||||
mm_addchars(char *input, char *add, u_int16_t linelength)
|
||||
mm_addchars(char *input, char *add, uint16_t linelength)
|
||||
{
|
||||
u_int32_t len;
|
||||
u_int32_t i;
|
||||
u_int32_t l;
|
||||
u_int32_t j;
|
||||
u_int16_t addcrlf;
|
||||
uint32_t len;
|
||||
uint32_t i;
|
||||
uint32_t l;
|
||||
uint32_t j;
|
||||
uint16_t addcrlf;
|
||||
char *output;
|
||||
char *orig;
|
||||
|
||||
|
Reference in New Issue
Block a user