gmime r1247 - in trunk: . gmime mono tests util
- From: fejj svn gnome org
- To: svn-commits-list gnome org
- Subject: gmime r1247 - in trunk: . gmime mono tests util
- Date: Sat, 24 May 2008 01:57:08 +0000 (UTC)
Author: fejj
Date: Sat May 24 01:57:08 2008
New Revision: 1247
URL: http://svn.gnome.org/viewvc/gmime?rev=1247&view=rev
Log:
2008-05-23 Jeffrey Stedfast <fejj novell com>
* gmime/*.[c,h]: Use gint64 instead of off_t for public APIs.
* mono/gmime-api.raw: s/off_t/gint64/g
Removed:
trunk/mono/gmime-sharp.pub
Modified:
trunk/ChangeLog
trunk/gmime/gmime-message-partial.c
trunk/gmime/gmime-parser.c
trunk/gmime/gmime-parser.h
trunk/gmime/gmime-part.c
trunk/gmime/gmime-stream-buffer.c
trunk/gmime/gmime-stream-cat.c
trunk/gmime/gmime-stream-file.c
trunk/gmime/gmime-stream-file.h
trunk/gmime/gmime-stream-filter.c
trunk/gmime/gmime-stream-fs.c
trunk/gmime/gmime-stream-fs.h
trunk/gmime/gmime-stream-mem.c
trunk/gmime/gmime-stream-mmap.c
trunk/gmime/gmime-stream-mmap.h
trunk/gmime/gmime-stream-null.c
trunk/gmime/gmime-stream.c
trunk/gmime/gmime-stream.h
trunk/mono/Makefile.am
trunk/mono/gmime-api.raw
trunk/tests/test-cat.c
trunk/tests/test-mbox.c
trunk/tests/test-streams.c
trunk/util/url-scanner.h
Modified: trunk/gmime/gmime-message-partial.c
==============================================================================
--- trunk/gmime/gmime-message-partial.c (original)
+++ trunk/gmime/gmime-message-partial.c Sat May 24 01:57:08 2008
@@ -402,7 +402,7 @@
GPtrArray *parts;
size_t len, end;
const char *id;
- off_t start;
+ gint64 start;
int i;
*nparts = 0;
Modified: trunk/gmime/gmime-parser.c
==============================================================================
--- trunk/gmime/gmime-parser.c (original)
+++ trunk/gmime/gmime-parser.c Sat May 24 01:57:08 2008
@@ -87,7 +87,7 @@
struct _GMimeParserPrivate {
GMimeStream *stream;
- off_t offset;
+ gint64 offset;
/* i/o buffers */
char realbuf[SCAN_HEAD + SCAN_BUF + 1];
@@ -95,7 +95,7 @@
char *inptr;
char *inend;
- off_t from_offset;
+ gint64 from_offset;
GByteArray *from_line;
regex_t header_regex;
@@ -112,8 +112,8 @@
char *rawptr;
size_t rawleft;
- off_t headers_start;
- off_t header_start;
+ gint64 headers_start;
+ gint64 header_start;
short int state;
@@ -137,7 +137,7 @@
size_t boundarylen;
size_t boundarylenfinal;
size_t boundarylenmax;
- off_t content_end;
+ gint64 content_end;
};
@@ -191,11 +191,11 @@
struct _header_raw *next;
char *name;
char *value;
- off_t offset;
+ gint64 offset;
};
static const char *
-header_raw_find (struct _header_raw *headers, const char *name, off_t *offset)
+header_raw_find (struct _header_raw *headers, const char *name, gint64 *offset)
{
struct _header_raw *h;
@@ -297,7 +297,7 @@
parser_init (GMimeParser *parser, GMimeStream *stream)
{
struct _GMimeParserPrivate *priv = parser->priv;
- off_t offset = -1;
+ gint64 offset = -1;
if (stream) {
g_object_ref (stream);
@@ -627,7 +627,7 @@
}
-static off_t
+static gint64
parser_offset (struct _GMimeParserPrivate *priv, const char *inptr)
{
if (priv->offset == -1)
@@ -649,7 +649,7 @@
* Returns the current stream offset from the parser's internal stream
* or -1 on error.
**/
-off_t
+gint64
g_mime_parser_tell (GMimeParser *parser)
{
g_return_val_if_fail (GMIME_IS_PARSER (parser), -1);
@@ -1125,7 +1125,7 @@
static int
check_boundary (struct _GMimeParserPrivate *priv, const char *start, size_t len)
{
- off_t offset = parser_offset (priv, start);
+ gint64 offset = parser_offset (priv, start);
if (start[len - 1] == '\r')
len--;
@@ -1271,7 +1271,7 @@
GByteArray *content = NULL;
GMimeDataWrapper *wrapper;
GMimeStream *stream;
- off_t start, end;
+ gint64 start, end;
int crlf;
g_assert (priv->state >= GMIME_PARSER_STATE_HEADERS_END);
@@ -1722,7 +1722,7 @@
* Returns the offset of the most recently parsed mbox-style From-line
* or -1 on error.
**/
-off_t
+gint64
g_mime_parser_get_from_offset (GMimeParser *parser)
{
struct _GMimeParserPrivate *priv;
Modified: trunk/gmime/gmime-parser.h
==============================================================================
--- trunk/gmime/gmime-parser.h (original)
+++ trunk/gmime/gmime-parser.h Sat May 24 01:57:08 2008
@@ -67,7 +67,7 @@
* g_mime_parser_set_header_regex().
**/
typedef void (* GMimeParserHeaderRegexFunc) (GMimeParser *parser, const char *header,
- const char *value, off_t offset,
+ const char *value, gint64 offset,
gpointer user_data);
@@ -95,13 +95,13 @@
GMimeMessage *g_mime_parser_construct_message (GMimeParser *parser);
-off_t g_mime_parser_tell (GMimeParser *parser);
+gint64 g_mime_parser_tell (GMimeParser *parser);
gboolean g_mime_parser_eos (GMimeParser *parser);
char *g_mime_parser_get_from (GMimeParser *parser);
-off_t g_mime_parser_get_from_offset (GMimeParser *parser);
+gint64 g_mime_parser_get_from_offset (GMimeParser *parser);
G_END_DECLS
Modified: trunk/gmime/gmime-part.c
==============================================================================
--- trunk/gmime/gmime-part.c (original)
+++ trunk/gmime/gmime-part.c Sat May 24 01:57:08 2008
@@ -1289,14 +1289,14 @@
retval = (char *) buf->data;
} else {
GByteArray *buf = GMIME_STREAM_MEM (stream)->buffer;
- off_t end_index = (off_t) buf->len;
- off_t start_index = 0;
+ gint64 end_index = (gint64) buf->len;
+ gint64 start_index = 0;
/* check boundaries */
if (stream->bound_start >= 0)
- start_index = CLAMP (stream->bound_start, 0, (off_t) buf->len);
+ start_index = CLAMP (stream->bound_start, 0, (gint64) buf->len);
if (stream->bound_end >= 0)
- end_index = CLAMP (stream->bound_end, 0, (off_t) buf->len);
+ end_index = CLAMP (stream->bound_end, 0, (gint64) buf->len);
if (end_index < start_index)
end_index = start_index;
Modified: trunk/gmime/gmime-stream-buffer.c
==============================================================================
--- trunk/gmime/gmime-stream-buffer.c (original)
+++ trunk/gmime/gmime-stream-buffer.c Sat May 24 01:57:08 2008
@@ -56,10 +56,10 @@
static int stream_close (GMimeStream *stream);
static gboolean stream_eos (GMimeStream *stream);
static int stream_reset (GMimeStream *stream);
-static off_t stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence);
-static off_t stream_tell (GMimeStream *stream);
+static gint64 stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence);
+static gint64 stream_tell (GMimeStream *stream);
static ssize_t stream_length (GMimeStream *stream);
-static GMimeStream *stream_substream (GMimeStream *stream, off_t start, off_t end);
+static GMimeStream *stream_substream (GMimeStream *stream, gint64 start, gint64 end);
static GMimeStreamClass *parent_class = NULL;
@@ -386,11 +386,11 @@
return 0;
}
-static off_t
-stream_seek_block_read (GMimeStream *stream, off_t offset, GMimeSeekWhence whence)
+static gint64
+stream_seek_block_read (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence)
{
GMimeStreamBuffer *buffer = (GMimeStreamBuffer *) stream;
- off_t real;
+ gint64 real;
/* convert all seeks into a relative seek (aka SEEK_CUR) */
switch (whence) {
@@ -457,12 +457,12 @@
return real;
}
-static off_t
-stream_seek_cache_read (GMimeStream *stream, off_t offset, GMimeSeekWhence whence)
+static gint64
+stream_seek_cache_read (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence)
{
GMimeStreamBuffer *buffer = (GMimeStreamBuffer *) stream;
size_t len, total = 0;
- off_t pos, real;
+ gint64 pos, real;
ssize_t nread;
switch (whence) {
@@ -532,12 +532,12 @@
return real;
}
-static off_t
-stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence)
+static gint64
+stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence)
{
/* FIXME: set errno appropriately?? */
GMimeStreamBuffer *buffer = (GMimeStreamBuffer *) stream;
- off_t real;
+ gint64 real;
switch (buffer->mode) {
case GMIME_STREAM_BUFFER_BLOCK_WRITE:
@@ -559,7 +559,7 @@
}
}
-static off_t
+static gint64
stream_tell (GMimeStream *stream)
{
return stream->position;
@@ -572,7 +572,7 @@
}
static GMimeStream *
-stream_substream (GMimeStream *stream, off_t start, off_t end)
+stream_substream (GMimeStream *stream, gint64 start, gint64 end)
{
GMimeStreamBuffer *buffer = (GMimeStreamBuffer *) stream;
Modified: trunk/gmime/gmime-stream-cat.c
==============================================================================
--- trunk/gmime/gmime-stream-cat.c (original)
+++ trunk/gmime/gmime-stream-cat.c Sat May 24 01:57:08 2008
@@ -50,10 +50,10 @@
static int stream_close (GMimeStream *stream);
static gboolean stream_eos (GMimeStream *stream);
static int stream_reset (GMimeStream *stream);
-static off_t stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence);
-static off_t stream_tell (GMimeStream *stream);
+static gint64 stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence);
+static gint64 stream_tell (GMimeStream *stream);
static ssize_t stream_length (GMimeStream *stream);
-static GMimeStream *stream_substream (GMimeStream *stream, off_t start, off_t end);
+static GMimeStream *stream_substream (GMimeStream *stream, gint64 start, gint64 end);
static GMimeStreamClass *parent_class = NULL;
@@ -62,7 +62,7 @@
struct _cat_node {
struct _cat_node *next;
GMimeStream *stream;
- off_t position;
+ gint64 position;
int id; /* for debugging */
};
@@ -143,7 +143,7 @@
GMimeStreamCat *cat = (GMimeStreamCat *) stream;
struct _cat_node *current;
ssize_t nread = 0;
- off_t offset;
+ gint64 offset;
/* check for end-of-stream */
if (stream->bound_end != -1 && stream->position >= stream->bound_end)
@@ -151,7 +151,7 @@
/* don't allow our caller to read past the end of the stream */
if (stream->bound_end != -1)
- len = MIN (stream->bound_end - stream->position, (off_t) len);
+ len = MIN (stream->bound_end - stream->position, (gint64) len);
if (!(current = cat->current))
return -1;
@@ -188,7 +188,7 @@
struct _cat_node *current;
size_t nwritten = 0;
ssize_t n = -1;
- off_t offset;
+ gint64 offset;
/* check for end-of-stream */
if (stream->bound_end != -1 && stream->position >= stream->bound_end)
@@ -196,7 +196,7 @@
/* don't allow our caller to write past the end of the stream */
if (stream->bound_end != -1)
- len = MIN (stream->bound_end - stream->position, (off_t) len);
+ len = MIN (stream->bound_end - stream->position, (gint64) len);
if (!(current = cat->current))
return -1;
@@ -324,12 +324,12 @@
return 0;
}
-static off_t
-stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence)
+static gint64
+stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence)
{
GMimeStreamCat *cat = (GMimeStreamCat *) stream;
struct _cat_node *current, *n;
- off_t real, off;
+ gint64 real, off;
ssize_t len;
d(fprintf (stderr, "GMimeStreamCat::stream_seek (%p, %ld, %d)\n",
@@ -522,7 +522,7 @@
return offset;
}
-static off_t
+static gint64
stream_tell (GMimeStream *stream)
{
return stream->position;
@@ -553,15 +553,15 @@
struct _sub_node {
struct _sub_node *next;
GMimeStream *stream;
- off_t start, end;
+ gint64 start, end;
};
static GMimeStream *
-stream_substream (GMimeStream *stream, off_t start, off_t end)
+stream_substream (GMimeStream *stream, gint64 start, gint64 end)
{
GMimeStreamCat *cat = (GMimeStreamCat *) stream;
struct _sub_node *streams, *tail, *s;
- off_t offset = 0, subend = 0;
+ gint64 offset = 0, subend = 0;
GMimeStream *substream;
struct _cat_node *n;
ssize_t len;
Modified: trunk/gmime/gmime-stream-file.c
==============================================================================
--- trunk/gmime/gmime-stream-file.c (original)
+++ trunk/gmime/gmime-stream-file.c Sat May 24 01:57:08 2008
@@ -50,10 +50,10 @@
static int stream_close (GMimeStream *stream);
static gboolean stream_eos (GMimeStream *stream);
static int stream_reset (GMimeStream *stream);
-static off_t stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence);
-static off_t stream_tell (GMimeStream *stream);
+static gint64 stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence);
+static gint64 stream_tell (GMimeStream *stream);
static ssize_t stream_length (GMimeStream *stream);
-static GMimeStream *stream_substream (GMimeStream *stream, off_t start, off_t end);
+static GMimeStream *stream_substream (GMimeStream *stream, gint64 start, gint64 end);
static GMimeStreamClass *parent_class = NULL;
@@ -135,7 +135,7 @@
return -1;
if (stream->bound_end != -1)
- len = MIN (stream->bound_end - stream->position, (off_t) len);
+ len = MIN (stream->bound_end - stream->position, (gint64) len);
/* make sure we are at the right position */
fseek (fstream->fp, stream->position, SEEK_SET);
@@ -156,7 +156,7 @@
return -1;
if (stream->bound_end != -1)
- len = MIN (stream->bound_end - stream->position, (off_t) len);
+ len = MIN (stream->bound_end - stream->position, (gint64) len);
/* make sure we are at the right position */
fseek (fstream->fp, stream->position, SEEK_SET);
@@ -222,11 +222,11 @@
return 0;
}
-static off_t
-stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence)
+static gint64
+stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence)
{
GMimeStreamFile *fstream = (GMimeStreamFile *) stream;
- off_t real = stream->position;
+ gint64 real = stream->position;
FILE *fp = fstream->fp;
g_return_val_if_fail (fstream->fp != NULL, -1);
@@ -272,7 +272,7 @@
return real;
}
-static off_t
+static gint64
stream_tell (GMimeStream *stream)
{
return stream->position;
@@ -282,7 +282,7 @@
stream_length (GMimeStream *stream)
{
GMimeStreamFile *fstream = (GMimeStreamFile *) stream;
- off_t bound_end;
+ gint64 bound_end;
if (stream->bound_start != -1 && stream->bound_end != -1)
return stream->bound_end - stream->bound_start;
@@ -298,7 +298,7 @@
}
static GMimeStream *
-stream_substream (GMimeStream *stream, off_t start, off_t end)
+stream_substream (GMimeStream *stream, gint64 start, gint64 end)
{
GMimeStreamFile *fstream;
@@ -326,7 +326,7 @@
g_mime_stream_file_new (FILE *fp)
{
GMimeStreamFile *fstream;
- off_t start;
+ gint64 start;
if ((start = ftell (fp)) == -1)
start = 0;
@@ -355,7 +355,7 @@
* Returns a stream using @fp with bounds @start and @end.
**/
GMimeStream *
-g_mime_stream_file_new_with_bounds (FILE *fp, off_t start, off_t end)
+g_mime_stream_file_new_with_bounds (FILE *fp, gint64 start, gint64 end)
{
GMimeStreamFile *fstream;
Modified: trunk/gmime/gmime-stream-file.h
==============================================================================
--- trunk/gmime/gmime-stream-file.h (original)
+++ trunk/gmime/gmime-stream-file.h Sat May 24 01:57:08 2008
@@ -54,7 +54,7 @@
GType g_mime_stream_file_get_type (void);
GMimeStream *g_mime_stream_file_new (FILE *fp);
-GMimeStream *g_mime_stream_file_new_with_bounds (FILE *fp, off_t start, off_t end);
+GMimeStream *g_mime_stream_file_new_with_bounds (FILE *fp, gint64 start, gint64 end);
gboolean g_mime_stream_file_get_owner (GMimeStreamFile *stream);
void g_mime_stream_file_set_owner (GMimeStreamFile *stream, gboolean owner);
Modified: trunk/gmime/gmime-stream-filter.c
==============================================================================
--- trunk/gmime/gmime-stream-filter.c (original)
+++ trunk/gmime/gmime-stream-filter.c Sat May 24 01:57:08 2008
@@ -79,10 +79,10 @@
static int stream_close (GMimeStream *stream);
static gboolean stream_eos (GMimeStream *stream);
static int stream_reset (GMimeStream *stream);
-static off_t stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence);
-static off_t stream_tell (GMimeStream *stream);
+static gint64 stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence);
+static gint64 stream_tell (GMimeStream *stream);
static ssize_t stream_length (GMimeStream *stream);
-static GMimeStream *stream_substream (GMimeStream *stream, off_t start, off_t end);
+static GMimeStream *stream_substream (GMimeStream *stream, gint64 start, gint64 end);
static GMimeStreamClass *parent_class = NULL;
@@ -340,13 +340,13 @@
return 0;
}
-static off_t
-stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence)
+static gint64
+stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence)
{
return -1;
}
-static off_t
+static gint64
stream_tell (GMimeStream *stream)
{
return -1;
@@ -359,7 +359,7 @@
}
static GMimeStream *
-stream_substream (GMimeStream *stream, off_t start, off_t end)
+stream_substream (GMimeStream *stream, gint64 start, gint64 end)
{
GMimeStreamFilter *filter = (GMimeStreamFilter *) stream;
GMimeStreamFilter *sub;
Modified: trunk/gmime/gmime-stream-fs.c
==============================================================================
--- trunk/gmime/gmime-stream-fs.c (original)
+++ trunk/gmime/gmime-stream-fs.c Sat May 24 01:57:08 2008
@@ -57,10 +57,10 @@
static int stream_close (GMimeStream *stream);
static gboolean stream_eos (GMimeStream *stream);
static int stream_reset (GMimeStream *stream);
-static off_t stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence);
-static off_t stream_tell (GMimeStream *stream);
+static gint64 stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence);
+static gint64 stream_tell (GMimeStream *stream);
static ssize_t stream_length (GMimeStream *stream);
-static GMimeStream *stream_substream (GMimeStream *stream, off_t start, off_t end);
+static GMimeStream *stream_substream (GMimeStream *stream, gint64 start, gint64 end);
static GMimeStreamClass *parent_class = NULL;
@@ -142,7 +142,7 @@
return -1;
if (stream->bound_end != -1)
- len = MIN (stream->bound_end - stream->position, (off_t) len);
+ len = MIN (stream->bound_end - stream->position, (gint64) len);
/* make sure we are at the right position */
lseek (fs->fd, stream->position, SEEK_SET);
@@ -170,7 +170,7 @@
return -1;
if (stream->bound_end != -1)
- len = MIN (stream->bound_end - stream->position, (off_t) len);
+ len = MIN (stream->bound_end - stream->position, (gint64) len);
/* make sure we are at the right position */
lseek (fs->fd, stream->position, SEEK_SET);
@@ -256,11 +256,11 @@
return 0;
}
-static off_t
-stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence)
+static gint64
+stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence)
{
GMimeStreamFs *fs = (GMimeStreamFs *) stream;
- off_t real;
+ gint64 real;
g_return_val_if_fail (fs->fd != -1, -1);
@@ -318,7 +318,7 @@
return real;
}
-static off_t
+static gint64
stream_tell (GMimeStream *stream)
{
return stream->position;
@@ -328,7 +328,7 @@
stream_length (GMimeStream *stream)
{
GMimeStreamFs *fs = (GMimeStreamFs *) stream;
- off_t bound_end;
+ gint64 bound_end;
if (stream->bound_end != -1)
return stream->bound_end - stream->bound_start;
@@ -343,7 +343,7 @@
}
static GMimeStream *
-stream_substream (GMimeStream *stream, off_t start, off_t end)
+stream_substream (GMimeStream *stream, gint64 start, gint64 end)
{
GMimeStreamFs *fs;
@@ -369,7 +369,7 @@
g_mime_stream_fs_new (int fd)
{
GMimeStreamFs *fs;
- off_t start;
+ gint64 start;
if ((start = lseek (fd, 0, SEEK_CUR)) == -1)
start = 0;
@@ -396,7 +396,7 @@
* Returns a stream using @fd with bounds @start and @end.
**/
GMimeStream *
-g_mime_stream_fs_new_with_bounds (int fd, off_t start, off_t end)
+g_mime_stream_fs_new_with_bounds (int fd, gint64 start, gint64 end)
{
GMimeStreamFs *fs;
Modified: trunk/gmime/gmime-stream-fs.h
==============================================================================
--- trunk/gmime/gmime-stream-fs.h (original)
+++ trunk/gmime/gmime-stream-fs.h Sat May 24 01:57:08 2008
@@ -54,7 +54,7 @@
GType g_mime_stream_fs_get_type (void);
GMimeStream *g_mime_stream_fs_new (int fd);
-GMimeStream *g_mime_stream_fs_new_with_bounds (int fd, off_t start, off_t end);
+GMimeStream *g_mime_stream_fs_new_with_bounds (int fd, gint64 start, gint64 end);
gboolean g_mime_stream_fs_get_owner (GMimeStreamFs *stream);
void g_mime_stream_fs_set_owner (GMimeStreamFs *stream, gboolean owner);
Modified: trunk/gmime/gmime-stream-mem.c
==============================================================================
--- trunk/gmime/gmime-stream-mem.c (original)
+++ trunk/gmime/gmime-stream-mem.c Sat May 24 01:57:08 2008
@@ -49,10 +49,10 @@
static int stream_close (GMimeStream *stream);
static gboolean stream_eos (GMimeStream *stream);
static int stream_reset (GMimeStream *stream);
-static off_t stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence);
-static off_t stream_tell (GMimeStream *stream);
+static gint64 stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence);
+static gint64 stream_tell (GMimeStream *stream);
static ssize_t stream_length (GMimeStream *stream);
-static GMimeStream *stream_substream (GMimeStream *stream, off_t start, off_t end);
+static GMimeStream *stream_substream (GMimeStream *stream, gint64 start, gint64 end);
static GMimeStreamClass *parent_class = NULL;
@@ -128,14 +128,14 @@
stream_read (GMimeStream *stream, char *buf, size_t len)
{
GMimeStreamMem *mem = (GMimeStreamMem *) stream;
- off_t bound_end;
+ gint64 bound_end;
ssize_t n;
g_return_val_if_fail (mem->buffer != NULL, -1);
- bound_end = stream->bound_end != -1 ? stream->bound_end : (off_t) mem->buffer->len;
+ bound_end = stream->bound_end != -1 ? stream->bound_end : (gint64) mem->buffer->len;
- n = MIN (bound_end - stream->position, (off_t) len);
+ n = MIN (bound_end - stream->position, (gint64) len);
if (n > 0) {
memcpy (buf, mem->buffer->data + stream->position, n);
stream->position += n;
@@ -151,7 +151,7 @@
stream_write (GMimeStream *stream, const char *buf, size_t len)
{
GMimeStreamMem *mem = (GMimeStreamMem *) stream;
- off_t bound_end;
+ gint64 bound_end;
ssize_t n;
g_return_val_if_fail (mem->buffer != NULL, -1);
@@ -162,7 +162,7 @@
} else
bound_end = stream->bound_end;
- n = MIN (bound_end - stream->position, (off_t) len);
+ n = MIN (bound_end - stream->position, (gint64) len);
if (n > 0) {
memcpy (mem->buffer->data + stream->position, buf, n);
stream->position += n;
@@ -199,11 +199,11 @@
stream_eos (GMimeStream *stream)
{
GMimeStreamMem *mem = (GMimeStreamMem *) stream;
- off_t bound_end;
+ gint64 bound_end;
g_return_val_if_fail (mem->buffer != NULL, TRUE);
- bound_end = stream->bound_end != -1 ? stream->bound_end : (off_t) mem->buffer->len;
+ bound_end = stream->bound_end != -1 ? stream->bound_end : (gint64) mem->buffer->len;
return stream->position >= bound_end;
}
@@ -216,15 +216,15 @@
return mem->buffer ? 0 : -1;
}
-static off_t
-stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence)
+static gint64
+stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence)
{
GMimeStreamMem *mem = (GMimeStreamMem *) stream;
- off_t bound_end, real = stream->position;
+ gint64 bound_end, real = stream->position;
g_return_val_if_fail (mem->buffer != NULL, -1);
- bound_end = stream->bound_end != -1 ? stream->bound_end : (off_t) mem->buffer->len;
+ bound_end = stream->bound_end != -1 ? stream->bound_end : (gint64) mem->buffer->len;
switch (whence) {
case GMIME_STREAM_SEEK_SET:
@@ -248,7 +248,7 @@
return stream->position;
}
-static off_t
+static gint64
stream_tell (GMimeStream *stream)
{
GMimeStreamMem *mem = (GMimeStreamMem *) stream;
@@ -262,17 +262,17 @@
stream_length (GMimeStream *stream)
{
GMimeStreamMem *mem = GMIME_STREAM_MEM (stream);
- off_t bound_end;
+ gint64 bound_end;
g_return_val_if_fail (mem->buffer != NULL, -1);
- bound_end = stream->bound_end != -1 ? stream->bound_end : (off_t) mem->buffer->len;
+ bound_end = stream->bound_end != -1 ? stream->bound_end : (gint64) mem->buffer->len;
return bound_end - stream->bound_start;
}
static GMimeStream *
-stream_substream (GMimeStream *stream, off_t start, off_t end)
+stream_substream (GMimeStream *stream, gint64 start, gint64 end)
{
GMimeStreamMem *mem;
Modified: trunk/gmime/gmime-stream-mmap.c
==============================================================================
--- trunk/gmime/gmime-stream-mmap.c (original)
+++ trunk/gmime/gmime-stream-mmap.c Sat May 24 01:57:08 2008
@@ -59,10 +59,10 @@
static int stream_close (GMimeStream *stream);
static gboolean stream_eos (GMimeStream *stream);
static int stream_reset (GMimeStream *stream);
-static off_t stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence);
-static off_t stream_tell (GMimeStream *stream);
+static gint64 stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence);
+static gint64 stream_tell (GMimeStream *stream);
static ssize_t stream_length (GMimeStream *stream);
-static GMimeStream *stream_substream (GMimeStream *stream, off_t start, off_t end);
+static GMimeStream *stream_substream (GMimeStream *stream, gint64 start, gint64 end);
static GMimeStreamClass *parent_class = NULL;
@@ -158,9 +158,9 @@
mapptr = mstream->map + stream->position;
if (stream->bound_end == -1)
- nread = MIN ((off_t) ((mstream->map + mstream->maplen) - mapptr), (off_t) len);
+ nread = MIN ((gint64) ((mstream->map + mstream->maplen) - mapptr), (gint64) len);
else
- nread = MIN (stream->bound_end - stream->position, (off_t) len);
+ nread = MIN (stream->bound_end - stream->position, (gint64) len);
if (nread > 0) {
memcpy (buf, mapptr, nread);
@@ -185,9 +185,9 @@
mapptr = mstream->map + stream->position;
if (stream->bound_end == -1)
- nwritten = MIN ((off_t) ((mstream->map + mstream->maplen) - mapptr), (off_t) len);
+ nwritten = MIN ((gint64) ((mstream->map + mstream->maplen) - mapptr), (gint64) len);
else
- nwritten = MIN (stream->bound_end - stream->position, (off_t) len);
+ nwritten = MIN (stream->bound_end - stream->position, (gint64) len);
if (nwritten > 0) {
memcpy (mapptr, buf, nwritten);
@@ -255,11 +255,11 @@
return 0;
}
-static off_t
-stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence)
+static gint64
+stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence)
{
GMimeStreamMmap *mstream = (GMimeStreamMmap *) stream;
- off_t real = stream->position;
+ gint64 real = stream->position;
g_return_val_if_fail (mstream->fd != -1, -1);
@@ -272,7 +272,7 @@
break;
case GMIME_STREAM_SEEK_END:
if (stream->bound_end == -1) {
- real = offset <= 0 ? stream->bound_start + (off_t) mstream->maplen + offset : -1;
+ real = offset <= 0 ? stream->bound_start + (gint64) mstream->maplen + offset : -1;
if (real != -1) {
if (real < stream->bound_start)
real = stream->bound_start;
@@ -302,7 +302,7 @@
return real;
}
-static off_t
+static gint64
stream_tell (GMimeStream *stream)
{
return stream->position;
@@ -320,7 +320,7 @@
}
static GMimeStream *
-stream_substream (GMimeStream *stream, off_t start, off_t end)
+stream_substream (GMimeStream *stream, gint64 start, gint64 end)
{
/* FIXME: maybe we should return a GMimeStreamFs? */
GMimeStreamMmap *mstream;
@@ -354,7 +354,7 @@
#ifdef HAVE_MMAP
GMimeStreamMmap *mstream;
struct stat st;
- off_t start;
+ gint64 start;
char *map;
start = lseek (fd, 0, SEEK_CUR);
@@ -398,7 +398,7 @@
* Returns a stream using @fd with bounds @start and @end.
**/
GMimeStream *
-g_mime_stream_mmap_new_with_bounds (int fd, int prot, int flags, off_t start, off_t end)
+g_mime_stream_mmap_new_with_bounds (int fd, int prot, int flags, gint64 start, gint64 end)
{
#ifdef HAVE_MMAP
GMimeStreamMmap *mstream;
Modified: trunk/gmime/gmime-stream-mmap.h
==============================================================================
--- trunk/gmime/gmime-stream-mmap.h (original)
+++ trunk/gmime/gmime-stream-mmap.h Sat May 24 01:57:08 2008
@@ -56,7 +56,7 @@
GType g_mime_stream_mmap_get_type (void);
GMimeStream *g_mime_stream_mmap_new (int fd, int prot, int flags);
-GMimeStream *g_mime_stream_mmap_new_with_bounds (int fd, int prot, int flags, off_t start, off_t end);
+GMimeStream *g_mime_stream_mmap_new_with_bounds (int fd, int prot, int flags, gint64 start, gint64 end);
G_END_DECLS
Modified: trunk/gmime/gmime-stream-null.c
==============================================================================
--- trunk/gmime/gmime-stream-null.c (original)
+++ trunk/gmime/gmime-stream-null.c Sat May 24 01:57:08 2008
@@ -52,10 +52,10 @@
static int stream_close (GMimeStream *stream);
static gboolean stream_eos (GMimeStream *stream);
static int stream_reset (GMimeStream *stream);
-static off_t stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence);
-static off_t stream_tell (GMimeStream *stream);
+static gint64 stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence);
+static gint64 stream_tell (GMimeStream *stream);
static ssize_t stream_length (GMimeStream *stream);
-static GMimeStream *stream_substream (GMimeStream *stream, off_t start, off_t end);
+static GMimeStream *stream_substream (GMimeStream *stream, gint64 start, gint64 end);
static GMimeStreamClass *parent_class = NULL;
@@ -180,11 +180,11 @@
return 0;
}
-static off_t
-stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence)
+static gint64
+stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence)
{
GMimeStreamNull *null = (GMimeStreamNull *) stream;
- off_t bound_end;
+ gint64 bound_end;
bound_end = stream->bound_end != -1 ? stream->bound_end : null->written;
@@ -206,7 +206,7 @@
return stream->position;
}
-static off_t
+static gint64
stream_tell (GMimeStream *stream)
{
return stream->position;
@@ -216,7 +216,7 @@
stream_length (GMimeStream *stream)
{
GMimeStreamNull *null = GMIME_STREAM_NULL (stream);
- off_t bound_end;
+ gint64 bound_end;
bound_end = stream->bound_end != -1 ? stream->bound_end : null->written;
@@ -224,7 +224,7 @@
}
static GMimeStream *
-stream_substream (GMimeStream *stream, off_t start, off_t end)
+stream_substream (GMimeStream *stream, gint64 start, gint64 end)
{
GMimeStreamNull *null;
Modified: trunk/gmime/gmime-stream.c
==============================================================================
--- trunk/gmime/gmime-stream.c (original)
+++ trunk/gmime/gmime-stream.c Sat May 24 01:57:08 2008
@@ -53,10 +53,10 @@
static int stream_close (GMimeStream *stream);
static gboolean stream_eos (GMimeStream *stream);
static int stream_reset (GMimeStream *stream);
-static off_t stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence);
-static off_t stream_tell (GMimeStream *stream);
+static gint64 stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence);
+static gint64 stream_tell (GMimeStream *stream);
static ssize_t stream_length (GMimeStream *stream);
-static GMimeStream *stream_substream (GMimeStream *stream, off_t start, off_t end);
+static GMimeStream *stream_substream (GMimeStream *stream, gint64 start, gint64 end);
static GObjectClass *parent_class = NULL;
@@ -139,7 +139,7 @@
* Initializes a new stream with bounds @start and @end.
**/
void
-g_mime_stream_construct (GMimeStream *stream, off_t start, off_t end)
+g_mime_stream_construct (GMimeStream *stream, gint64 start, gint64 end)
{
stream->position = start;
stream->bound_start = start;
@@ -317,8 +317,8 @@
}
-static off_t
-stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence)
+static gint64
+stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence)
{
d(g_warning ("Invoked default stream_seek implementation."));
return -1;
@@ -346,8 +346,8 @@
*
* Returns the resultant position on success or %-1 on fail.
**/
-off_t
-g_mime_stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence)
+gint64
+g_mime_stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence)
{
g_return_val_if_fail (GMIME_IS_STREAM (stream), -1);
@@ -355,7 +355,7 @@
}
-static off_t
+static gint64
stream_tell (GMimeStream *stream)
{
d(g_warning ("Invoked default stream_tell implementation."));
@@ -371,7 +371,7 @@
*
* Returns the current position within the stream or %-1 on fail.
**/
-off_t
+gint64
g_mime_stream_tell (GMimeStream *stream)
{
g_return_val_if_fail (GMIME_IS_STREAM (stream), -1);
@@ -406,7 +406,7 @@
static GMimeStream *
-stream_substream (GMimeStream *stream, off_t start, off_t end)
+stream_substream (GMimeStream *stream, gint64 start, gint64 end)
{
d(g_warning ("Invoked default stream_tell implementation."));
return NULL;
@@ -424,7 +424,7 @@
* Returns a substream of @stream with bounds @start and @end.
**/
GMimeStream *
-g_mime_stream_substream (GMimeStream *stream, off_t start, off_t end)
+g_mime_stream_substream (GMimeStream *stream, gint64 start, gint64 end)
{
GMimeStream *sub;
@@ -482,7 +482,7 @@
* Set the bounds on a stream.
**/
void
-g_mime_stream_set_bounds (GMimeStream *stream, off_t start, off_t end)
+g_mime_stream_set_bounds (GMimeStream *stream, gint64 start, gint64 end)
{
g_return_if_fail (GMIME_IS_STREAM (stream));
Modified: trunk/gmime/gmime-stream.h
==============================================================================
--- trunk/gmime/gmime-stream.h (original)
+++ trunk/gmime/gmime-stream.h Sat May 24 01:57:08 2008
@@ -77,9 +77,9 @@
/* Note: these are private fields!! */
GMimeStream *super_stream;
- off_t position;
- off_t bound_start;
- off_t bound_end;
+ gint64 position;
+ gint64 bound_start;
+ gint64 bound_end;
};
struct _GMimeStreamClass {
@@ -91,16 +91,16 @@
int (* close) (GMimeStream *stream);
gboolean (* eos) (GMimeStream *stream);
int (* reset) (GMimeStream *stream);
- off_t (* seek) (GMimeStream *stream, off_t offset, GMimeSeekWhence whence);
- off_t (* tell) (GMimeStream *stream);
+ gint64 (* seek) (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence);
+ gint64 (* tell) (GMimeStream *stream);
ssize_t (* length) (GMimeStream *stream);
- GMimeStream * (* substream) (GMimeStream *stream, off_t start, off_t end);
+ GMimeStream * (* substream) (GMimeStream *stream, gint64 start, gint64 end);
};
GType g_mime_stream_get_type (void);
-void g_mime_stream_construct (GMimeStream *stream, off_t start, off_t end);
+void g_mime_stream_construct (GMimeStream *stream, gint64 start, gint64 end);
/* public methods */
@@ -110,18 +110,18 @@
int g_mime_stream_close (GMimeStream *stream);
gboolean g_mime_stream_eos (GMimeStream *stream);
int g_mime_stream_reset (GMimeStream *stream);
-off_t g_mime_stream_seek (GMimeStream *stream, off_t offset, GMimeSeekWhence whence);
-off_t g_mime_stream_tell (GMimeStream *stream);
+gint64 g_mime_stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence);
+gint64 g_mime_stream_tell (GMimeStream *stream);
ssize_t g_mime_stream_length (GMimeStream *stream);
-GMimeStream *g_mime_stream_substream (GMimeStream *stream, off_t start, off_t end);
+GMimeStream *g_mime_stream_substream (GMimeStream *stream, gint64 start, gint64 end);
#ifndef GMIME_DISABLE_DEPRECATED
void g_mime_stream_ref (GMimeStream *stream);
void g_mime_stream_unref (GMimeStream *stream);
#endif
-void g_mime_stream_set_bounds (GMimeStream *stream, off_t start, off_t end);
+void g_mime_stream_set_bounds (GMimeStream *stream, gint64 start, gint64 end);
ssize_t g_mime_stream_write_string (GMimeStream *stream, const char *string);
ssize_t g_mime_stream_printf (GMimeStream *stream, const char *fmt, ...) G_GNUC_PRINTF (2, 3);
Modified: trunk/mono/Makefile.am
==============================================================================
--- trunk/mono/Makefile.am (original)
+++ trunk/mono/Makefile.am Sat May 24 01:57:08 2008
@@ -54,12 +54,6 @@
$(SOURCES_XML) \
gmime-sharp.pc.in
-if ENABLE_LARGEFILE
-off_t_type=gint64
-else
-off_t_type=long
-endif
-
$(METADATA): $(srcdir)/$(METADATA_IN)
sed -e 's|\ off_t_type\@|$(off_t_type)|g' < $(srcdir)/$(METADATA_IN) > $@
Modified: trunk/mono/gmime-api.raw
==============================================================================
--- trunk/mono/gmime-api.raw (original)
+++ trunk/mono/gmime-api.raw Sat May 24 01:57:08 2008
@@ -124,7 +124,7 @@
<parameter type="GMimeParser*" name="parser" />
<parameter type="const-char*" name="header" />
<parameter type="const-char*" name="value" />
- <parameter type="off_t" name="offset" />
+ <parameter type="gint64" name="offset" />
<parameter type="gpointer" name="user_data" />
</parameters>
</callback>
@@ -1151,7 +1151,7 @@
<return-type type="char*" />
</method>
<method name="GetFromOffset" cname="g_mime_parser_get_from_offset">
- <return-type type="off_t" />
+ <return-type type="gint64" />
</method>
<method name="GetPersistStream" cname="g_mime_parser_get_persist_stream">
<return-type type="gboolean" />
@@ -1204,7 +1204,7 @@
</parameters>
</method>
<method name="Tell" cname="g_mime_parser_tell">
- <return-type type="off_t" />
+ <return-type type="gint64" />
</method>
</object>
<object name="Part" cname="GMimePart" parent="GMimeObject">
@@ -1465,9 +1465,9 @@
</object>
<object name="Stream" cname="GMimeStream" parent="GObject">
<field name="SuperStream" cname="super_stream" type="GMimeStream*" />
- <field name="Position" cname="position" type="off_t" />
- <field name="BoundStart" cname="bound_start" type="off_t" />
- <field name="BoundEnd" cname="bound_end" type="off_t" />
+ <field name="Position" cname="position" type="gint64" />
+ <field name="BoundStart" cname="bound_start" type="gint64" />
+ <field name="BoundEnd" cname="bound_end" type="gint64" />
<virtual_method name="Read" cname="read">
<return-type type="ssize_t" />
<parameters>
@@ -1509,15 +1509,15 @@
</parameters>
</virtual_method>
<virtual_method name="Seek" cname="seek">
- <return-type type="off_t" />
+ <return-type type="gint64" />
<parameters>
<parameter type="GMimeStream*" name="stream" />
- <parameter type="off_t" name="offset" />
+ <parameter type="gint64" name="offset" />
<parameter type="GMimeSeekWhence" name="whence" />
</parameters>
</virtual_method>
<virtual_method name="Tell" cname="tell">
- <return-type type="off_t" />
+ <return-type type="gint64" />
<parameters>
<parameter type="GMimeStream*" name="stream" />
</parameters>
@@ -1532,8 +1532,8 @@
<return-type type="GMimeStream*" />
<parameters>
<parameter type="GMimeStream*" name="stream" />
- <parameter type="off_t" name="start" />
- <parameter type="off_t" name="end" />
+ <parameter type="gint64" name="start" />
+ <parameter type="gint64" name="end" />
</parameters>
</virtual_method>
<method name="Close" cname="g_mime_stream_close">
@@ -1542,8 +1542,8 @@
<method name="Construct" cname="g_mime_stream_construct">
<return-type type="void" />
<parameters>
- <parameter type="off_t" name="start" />
- <parameter type="off_t" name="end" />
+ <parameter type="gint64" name="start" />
+ <parameter type="gint64" name="end" />
</parameters>
</method>
<method name="Eos" cname="g_mime_stream_eos">
@@ -1579,28 +1579,28 @@
<return-type type="int" />
</method>
<method name="Seek" cname="g_mime_stream_seek">
- <return-type type="off_t" />
+ <return-type type="gint64" />
<parameters>
- <parameter type="off_t" name="offset" />
+ <parameter type="gint64" name="offset" />
<parameter type="GMimeSeekWhence" name="whence" />
</parameters>
</method>
<method name="SetBounds" cname="g_mime_stream_set_bounds">
<return-type type="void" />
<parameters>
- <parameter type="off_t" name="start" />
- <parameter type="off_t" name="end" />
+ <parameter type="gint64" name="start" />
+ <parameter type="gint64" name="end" />
</parameters>
</method>
<method name="Substream" cname="g_mime_stream_substream">
<return-type type="GMimeStream*" />
<parameters>
- <parameter type="off_t" name="start" />
- <parameter type="off_t" name="end" />
+ <parameter type="gint64" name="start" />
+ <parameter type="gint64" name="end" />
</parameters>
</method>
<method name="Tell" cname="g_mime_stream_tell">
- <return-type type="off_t" />
+ <return-type type="gint64" />
</method>
<method name="Unref" cname="g_mime_stream_unref" deprecated="1">
<return-type type="void" />
@@ -1695,8 +1695,8 @@
<constructor cname="g_mime_stream_file_new_with_bounds">
<parameters>
<parameter type="FILE*" name="fp" />
- <parameter type="off_t" name="start" />
- <parameter type="off_t" name="end" />
+ <parameter type="gint64" name="start" />
+ <parameter type="gint64" name="end" />
</parameters>
</constructor>
<method name="SetOwner" cname="g_mime_stream_file_set_owner">
@@ -1748,8 +1748,8 @@
<constructor cname="g_mime_stream_fs_new_with_bounds">
<parameters>
<parameter type="int" name="fd" />
- <parameter type="off_t" name="start" />
- <parameter type="off_t" name="end" />
+ <parameter type="gint64" name="start" />
+ <parameter type="gint64" name="end" />
</parameters>
</constructor>
<method name="SetOwner" cname="g_mime_stream_fs_set_owner">
@@ -1817,8 +1817,8 @@
<parameter type="int" name="fd" />
<parameter type="int" name="prot" />
<parameter type="int" name="flags" />
- <parameter type="off_t" name="start" />
- <parameter type="off_t" name="end" />
+ <parameter type="gint64" name="start" />
+ <parameter type="gint64" name="end" />
</parameters>
</constructor>
</object>
Modified: trunk/tests/test-cat.c
==============================================================================
--- trunk/tests/test-cat.c (original)
+++ trunk/tests/test-cat.c Sat May 24 01:57:08 2008
@@ -101,8 +101,8 @@
struct _StreamPart {
struct _StreamPart *next;
- off_t pstart, pend; /* start/end offsets of the part stream */
- off_t wstart, wend; /* corresponding start/end offsets of the whole stream */
+ gint64 pstart, pend; /* start/end offsets of the part stream */
+ gint64 wstart, wend; /* corresponding start/end offsets of the whole stream */
char filename[256];
};
@@ -298,7 +298,7 @@
struct _StreamPart *part = parts;
GMimeStream *stream, *cat;
Exception *ex;
- off_t offset;
+ gint64 offset;
size_t size;
ssize_t n;
int fd;
@@ -332,7 +332,7 @@
}
/* calculate a random seek offset to compare at */
- offset = (off_t) (size * (rand () / (RAND_MAX + 1.0)));
+ offset = (gint64) (size * (rand () / (RAND_MAX + 1.0)));
if (g_mime_stream_seek (whole, offset, GMIME_STREAM_SEEK_SET) == -1) {
ex = exception_new ("could not seek to " OFF_T " in original stream: %s",
@@ -358,7 +358,7 @@
{
GMimeStream *stream, *cat, *sub1, *sub2;
struct _StreamPart *part = parts;
- off_t start, end;
+ gint64 start, end;
Exception *ex;
size_t size;
ssize_t n;
@@ -393,9 +393,9 @@
}
/* calculate a random start/end offsets */
- start = (off_t) (size * (rand () / (RAND_MAX + 1.0)));
+ start = (gint64) (size * (rand () / (RAND_MAX + 1.0)));
if (rand () % 2)
- end = start + (off_t) ((size - start) * (rand () / (RAND_MAX + 1.0)));
+ end = start + (gint64) ((size - start) * (rand () / (RAND_MAX + 1.0)));
else
end = -1;
@@ -451,7 +451,7 @@
ssize_t wholelen, left;
GMimeStream *whole;
guint32 part = 0;
- off_t start = 0;
+ gint64 start = 0;
char *filename;
struct stat st;
size_t len;
@@ -515,7 +515,7 @@
len = 1 + (size_t) (left * (rand() / (RAND_MAX + 1.0)));
n = g_new (struct _StreamPart, 1);
sprintf (n->filename, "%s.%u", filename, part++);
- n->pstart = (off_t) 0; /* FIXME: we could make this a random offset */
+ n->pstart = (gint64) 0; /* FIXME: we could make this a random offset */
n->pend = n->pstart + len;
n->wend = start + len;
n->wstart = start;
Modified: trunk/tests/test-mbox.c
==============================================================================
--- trunk/tests/test-mbox.c (original)
+++ trunk/tests/test-mbox.c Sat May 24 01:57:08 2008
@@ -85,7 +85,7 @@
static void
-header_cb (GMimeParser *parser, const char *header, const char *value, off_t offset, gpointer user_data)
+header_cb (GMimeParser *parser, const char *header, const char *value, gint64 offset, gpointer user_data)
{
GMimeStream *stream = user_data;
@@ -97,7 +97,7 @@
{
GMimeMessage *message;
const char *exev;
- off_t start, end;
+ gint64 start, end;
int nmsg = 0;
char *from;
@@ -134,7 +134,7 @@
char buf[4096], dbuf[4096], errstr[1024], *bufptr, *bufend, *dbufptr;
size_t totalsize, totalread = 0;
size_t nread, size;
- off_t offset = 0;
+ gint64 offset = 0;
ssize_t n;
v(fprintf (stdout, "Checking if streams match... "));
Modified: trunk/tests/test-streams.c
==============================================================================
--- trunk/tests/test-streams.c (original)
+++ trunk/tests/test-streams.c Sat May 24 01:57:08 2008
@@ -240,7 +240,7 @@
static gboolean
-check_stream_fs (const char *input, const char *output, const char *filename, off_t start, off_t end)
+check_stream_fs (const char *input, const char *output, const char *filename, gint64 start, gint64 end)
{
GMimeStream *streams[2], *stream;
Exception *ex = NULL;
@@ -273,7 +273,7 @@
}
static gboolean
-check_stream_file (const char *input, const char *output, const char *filename, off_t start, off_t end)
+check_stream_file (const char *input, const char *output, const char *filename, gint64 start, gint64 end)
{
GMimeStream *streams[2], *stream;
Exception *ex = NULL;
@@ -306,7 +306,7 @@
}
static gboolean
-check_stream_mmap (const char *input, const char *output, const char *filename, off_t start, off_t end)
+check_stream_mmap (const char *input, const char *output, const char *filename, gint64 start, gint64 end)
{
GMimeStream *streams[2], *stream;
Exception *ex = NULL;
@@ -339,7 +339,7 @@
}
static gboolean
-check_stream_buffer_block (const char *input, const char *output, const char *filename, off_t start, off_t end)
+check_stream_buffer_block (const char *input, const char *output, const char *filename, gint64 start, gint64 end)
{
GMimeStream *streams[2], *stream;
Exception *ex = NULL;
@@ -374,7 +374,7 @@
}
static gboolean
-check_stream_buffer_cache (const char *input, const char *output, const char *filename, off_t start, off_t end)
+check_stream_buffer_cache (const char *input, const char *output, const char *filename, gint64 start, gint64 end)
{
GMimeStream *streams[2], *stream;
Exception *ex = NULL;
@@ -409,7 +409,7 @@
}
-typedef gboolean (* checkFunc) (const char *, const char *, const char *, off_t, off_t);
+typedef gboolean (* checkFunc) (const char *, const char *, const char *, gint64, gint64);
static struct {
const char *what;
@@ -427,7 +427,7 @@
{
char inpath[256], outpath[256], *p, *q, *o;
struct dirent *dent;
- off_t start, end;
+ gint64 start, end;
size_t n;
guint i;
@@ -520,7 +520,7 @@
{
GMimeStream *istream, *ostream, *stream;
char input[256], output[256], *name, *p;
- off_t start, end;
+ gint64 start, end;
struct stat st;
size_t len;
int fd, i;
@@ -561,7 +561,7 @@
for (i = 0; i < 64; i++) {
retry:
- start = (off_t) (st.st_size * (rand () / (RAND_MAX + 1.0)));
+ start = (gint64) (st.st_size * (rand () / (RAND_MAX + 1.0)));
len = (size_t) (st.st_size * (rand () / (RAND_MAX + 1.0)));
if (start + len > st.st_size) {
len = st.st_size - start;
Modified: trunk/util/url-scanner.h
==============================================================================
--- trunk/util/url-scanner.h (original)
+++ trunk/util/url-scanner.h Sat May 24 01:57:08 2008
@@ -30,8 +30,8 @@
typedef struct {
const char *pattern;
const char *prefix;
- off_t um_so;
- off_t um_eo;
+ size_t um_so;
+ size_t um_eo;
} urlmatch_t;
typedef gboolean (*UrlScanFunc) (const char *in, const char *pos, const char *inend, urlmatch_t *match);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
