File gmime-no-off_t-at-all.patch of Package gmime

Overview Repositories Revisions Requests Users Attributes Meta

File gmime-no-off_t-at-all.patch of Package gmime (Revision 4b79ee49d6afdc1574784f455a012ffa)

Currently displaying revision 4b79ee49d6afdc1574784f455a012ffa , Show latest

--- configure.in
+++ configure.in
@@ -303,9 +303,8 @@
 dnl Check type sizes
 AC_CHECK_SIZEOF(ssize_t)
 AC_CHECK_SIZEOF(size_t)
-AC_CHECK_SIZEOF(off_t)
 
-dnl convenience printf formatting macros for ssize_t/size_t/off_t
+dnl convenience printf formatting macros for ssize_t/size_t
 if test $ac_cv_sizeof_size_t -eq 8; then
    AC_DEFINE(SSIZE_T, "%lld", [Define to the `ssize_t' printf formatter.])
    AC_DEFINE(SIZE_T, "%llu", [Define to the `size_t' printf formatter.])
@@ -313,11 +312,6 @@
    AC_DEFINE(SSIZE_T, "%ld", [Define to the `ssize_t' printf formatter.])
    AC_DEFINE(SIZE_T, "%lu", [Define to the `size_t' printf formatter.])
 fi
-if test $ac_cv_sizeof_off_t -eq 8; then
-   AC_DEFINE(OFF_T, "%lld", [Define to the `off_t' printf formatter.])
-else
-   AC_DEFINE(OFF_T, "%ld", [Define to the `off_t' printf formatter.])
-fi
 
 
 dnl Check for some network functions
--- gmime/gmime-message-partial.c
+++ gmime/gmime-message-partial.c
@@ -391,7 +391,7 @@
 	GPtrArray *parts;
 	size_t len, end;
 	const char *id;
-	off_t start;
+	goffset start;
 	int i;
 	
 	*nparts = 0;
--- gmime/gmime-parser.c
+++ gmime/gmime-parser.c
@@ -74,7 +74,7 @@
 	
 	GMimeStream *stream;
 	
-	off_t offset;
+	goffset offset;
 	
 	/* i/o buffers */
 	char realbuf[SCAN_HEAD + SCAN_BUF + 1];
@@ -82,7 +82,7 @@
 	char *inptr;
 	char *inend;
 	
-	off_t from_offset;
+	goffset from_offset;
 	GByteArray *from_line;
 	
 	regex_t header_regex;
@@ -99,8 +99,8 @@
 	char *rawptr;
 	guint rawleft;
 	
-	off_t headers_start;
-	off_t header_start;
+	goffset headers_start;
+	goffset header_start;
 	
 	unsigned int unstep:26;
 	unsigned int midline:1;
@@ -122,7 +122,7 @@
 	size_t boundarylen;
 	size_t boundarylenfinal;
 	size_t boundarylenmax;
-	off_t content_end;
+	goffset content_end;
 };
 
 
@@ -176,11 +176,11 @@
 	struct _header_raw *next;
 	char *name;
 	char *value;
-	off_t offset;
+	goffset 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, goffset *offset)
 {
 	struct _header_raw *h;
 	
@@ -282,7 +282,7 @@
 parser_init (GMimeParser *parser, GMimeStream *stream)
 {
 	struct _GMimeParserPrivate *priv = parser->priv;
-	off_t offset = -1;
+	goffset offset = -1;
 	
 	if (stream) {
 		g_object_ref (stream);
@@ -621,7 +621,7 @@
 }
 
 
-static off_t
+static goffset
 parser_offset (struct _GMimeParserPrivate *priv, const char *inptr)
 {
 	if (priv->offset == -1)
@@ -1014,7 +1014,7 @@
 static int
 check_boundary (struct _GMimeParserPrivate *priv, const char *start, size_t len)
 {
-	off_t offset = parser_offset (priv, start);
+	goffset offset = parser_offset (priv, start);
 	
 	if (start[len - 1] == '\r')
 		len--;
@@ -1160,7 +1160,7 @@
 	GByteArray *content = NULL;
 	GMimeDataWrapper *wrapper;
 	GMimeStream *stream;
-	off_t start, end;
+	goffset start, end;
 	guint crlf;
 	
 	if (priv->persist_stream && priv->seekable)
--- gmime/gmime-part.c
+++ gmime/gmime-part.c
@@ -1278,14 +1278,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;
+		goffset end_index = (goffset) buf->len;
+		goffset 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, (goffset) 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, (goffset) buf->len);
 		if (end_index < start_index)
 			end_index = start_index;
 		
--- gmime/gmime-stream-buffer.c
+++ gmime/gmime-stream-buffer.c
@@ -316,7 +316,7 @@
 {
 	/* FIXME: set errno appropriately?? */
 	GMimeStreamBuffer *buffer = (GMimeStreamBuffer *) stream;
-	off_t real = -1;
+	goffset real = -1;
 	
 	switch (buffer->mode) {
 	case GMIME_STREAM_BUFFER_BLOCK_WRITE:
@@ -355,7 +355,7 @@
 			/* buffer any data between position and real */
 			size_t len, total = 0;
 			ssize_t nread;
-			off_t pos;
+			goffset pos;
 			
 			len = real - (stream->bound_start + (buffer->bufend - buffer->bufptr));
 			
--- gmime/gmime-stream-cat.c
+++ gmime/gmime-stream-cat.c
@@ -51,7 +51,7 @@
 struct _cat_node {
 	struct _cat_node *next;
 	GMimeStream *stream;
-	off_t position;
+	goffset position;
 	int id; /* for debugging */
 };
 
@@ -132,7 +132,7 @@
 	GMimeStreamCat *cat = (GMimeStreamCat *) stream;
 	struct _cat_node *current;
 	ssize_t nread = 0;
-	off_t offset;
+	goffset offset;
 	
 	/* check for end-of-stream */
 	if (stream->bound_end != -1 && stream->position >= stream->bound_end)
@@ -140,7 +140,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, (goffset) len);
 	
 	if (!(current = cat->current))
 		return -1;
@@ -182,7 +182,7 @@
 	struct _cat_node *current;
 	size_t nwritten = 0;
 	ssize_t n = -1;
-	off_t offset;
+	goffset offset;
 	
 	/* check for end-of-stream */
 	if (stream->bound_end != -1 && stream->position >= stream->bound_end)
@@ -190,7 +190,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, (goffset) len);
 	
 	if (!(current = cat->current))
 		return -1;
@@ -323,7 +323,7 @@
 {
 	GMimeStreamCat *cat = (GMimeStreamCat *) stream;
 	struct _cat_node *current, *n;
-	off_t real, off;
+	goffset real, off;
 	ssize_t len;
 	
 	d(fprintf (stderr, "GMimeStreamCat::stream_seek (%p, %ld, %d)\n",
@@ -547,7 +547,7 @@
 struct _sub_node {
 	struct _sub_node *next;
 	GMimeStream *stream;
-	off_t start, end;
+	goffset start, end;
 };
 
 static GMimeStream *
@@ -555,7 +555,7 @@
 {
 	GMimeStreamCat *cat = (GMimeStreamCat *) stream;
 	struct _sub_node *streams, *tail, *s;
-	off_t offset = 0, subend = 0;
+	goffset offset = 0, subend = 0;
 	GMimeStream *substream;
 	struct _cat_node *n;
 	ssize_t len;
--- gmime/gmime-stream-file.c
+++ gmime/gmime-stream-file.c
@@ -120,7 +120,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, (goffset) len);
 	
 	/* make sure we are at the right position */
 	fseek (fstream->fp, stream->position, SEEK_SET);
@@ -141,7 +141,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, (goffset) len);
 	
 	/* make sure we are at the right position */
 	fseek (fstream->fp, stream->position, SEEK_SET);
@@ -211,7 +211,7 @@
 stream_seek (GMimeStream *stream, goffset offset, GMimeSeekWhence whence)
 {
 	GMimeStreamFile *fstream = (GMimeStreamFile *) stream;
-	off_t real = stream->position;
+	goffset real = stream->position;
 	FILE *fp = fstream->fp;
 	
 	g_return_val_if_fail (fstream->fp != NULL, -1);
@@ -267,7 +267,7 @@
 stream_length (GMimeStream *stream)
 {
 	GMimeStreamFile *fstream = (GMimeStreamFile *) stream;
-	off_t bound_end;
+	goffset bound_end;
 	
 	if (stream->bound_start != -1 && stream->bound_end != -1)
 		return stream->bound_end - stream->bound_start;
@@ -311,7 +311,7 @@
 g_mime_stream_file_new (FILE *fp)
 {
 	GMimeStreamFile *fstream;
-	off_t start;
+	goffset start;
 	
 	if ((start = ftell (fp)) == -1)
 		start = 0;
--- gmime/gmime-stream-fs.c
+++ gmime/gmime-stream-fs.c
@@ -130,7 +130,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, (goffset) len);
 	
 	/* make sure we are at the right position */
 	lseek (fs->fd, stream->position, SEEK_SET);
@@ -158,7 +158,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, (goffset) len);
 	
 	/* make sure we are at the right position */
 	lseek (fs->fd, stream->position, SEEK_SET);
@@ -316,7 +316,7 @@
 stream_length (GMimeStream *stream)
 {
 	GMimeStreamFs *fs = (GMimeStreamFs *) stream;
-	off_t bound_end;
+	goffset bound_end;
 	
 	if (stream->bound_end != -1)
 		return stream->bound_end - stream->bound_start;
@@ -357,7 +357,7 @@
 g_mime_stream_fs_new (int fd)
 {
 	GMimeStreamFs *fs;
-	off_t start;
+	goffset start;
 	
 	if ((start = lseek (fd, 0, SEEK_CUR)) == -1)
 		start = 0;
--- gmime/gmime-stream-mem.c
+++ gmime/gmime-stream-mem.c
@@ -116,14 +116,14 @@
 stream_read (GMimeStream *stream, char *buf, size_t len)
 {
 	GMimeStreamMem *mem = (GMimeStreamMem *) stream;
-	off_t bound_end;
+	goffset 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 : (goffset) mem->buffer->len;
 	
-	n = MIN (bound_end - stream->position, (off_t) len);
+	n = MIN (bound_end - stream->position, (goffset) len);
 	if (n > 0) {
 		memcpy (buf, mem->buffer->data + stream->position, n);
 		stream->position += n;
@@ -139,7 +139,7 @@
 stream_write (GMimeStream *stream, const char *buf, size_t len)
 {
 	GMimeStreamMem *mem = (GMimeStreamMem *) stream;
-	off_t bound_end;
+	goffset bound_end;
 	ssize_t n;
 	
 	g_return_val_if_fail (mem->buffer != NULL, -1);
@@ -150,7 +150,7 @@
 	} else
 		bound_end = stream->bound_end;
 	
-	n = MIN (bound_end - stream->position, (off_t) len);
+	n = MIN (bound_end - stream->position, (goffset) len);
 	if (n > 0) {
 		memcpy (mem->buffer->data + stream->position, buf, n);
 		stream->position += n;
@@ -187,11 +187,11 @@
 stream_eos (GMimeStream *stream)
 {
 	GMimeStreamMem *mem = (GMimeStreamMem *) stream;
-	off_t bound_end;
+	goffset 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 : (goffset) mem->buffer->len;
 	
 	return stream->position >= bound_end;
 }
@@ -208,11 +208,11 @@
 stream_seek (GMimeStream *stream, goffset offset, GMimeSeekWhence whence)
 {
 	GMimeStreamMem *mem = (GMimeStreamMem *) stream;
-	off_t bound_end, real = stream->position;
+	goffset 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 : (goffset) mem->buffer->len;
 	
 	switch (whence) {
 	case GMIME_STREAM_SEEK_SET:
@@ -250,11 +250,11 @@
 stream_length (GMimeStream *stream)
 {
 	GMimeStreamMem *mem = GMIME_STREAM_MEM (stream);
-	off_t bound_end;
+	goffset 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 : (goffset) mem->buffer->len;
 	
 	return bound_end - stream->bound_start;
 }
--- gmime/gmime-stream-mmap.c
+++ gmime/gmime-stream-mmap.c
@@ -144,9 +144,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 ((goffset) ((mstream->map + mstream->maplen) - mapptr), (goffset) len);
 	else
-		nread = MIN (stream->bound_end - stream->position, (off_t) len);
+		nread = MIN (stream->bound_end - stream->position, (goffset) len);
 	
 	if (nread > 0) {
 		memcpy (buf, mapptr, nread);
@@ -171,9 +171,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 ((goffset) ((mstream->map + mstream->maplen) - mapptr), (goffset) len);
 	else
-		nwritten = MIN (stream->bound_end - stream->position, (off_t) len);
+		nwritten = MIN (stream->bound_end - stream->position, (goffset) len);
 	
 	if (nwritten > 0) {
 		memcpy (mapptr, buf, nwritten);
@@ -245,7 +245,7 @@
 stream_seek (GMimeStream *stream, goffset offset, GMimeSeekWhence whence)
 {
 	GMimeStreamMmap *mstream = (GMimeStreamMmap *) stream;
-	off_t real = stream->position;
+	goffset real = stream->position;
 	
 	g_return_val_if_fail (mstream->fd != -1, -1);
 	
@@ -258,7 +258,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 + (goffset) mstream->maplen + offset : -1;
 			if (real != -1) {
 				if (real < stream->bound_start)
 					real = stream->bound_start;
@@ -340,7 +340,7 @@
 #ifdef HAVE_MMAP
 	GMimeStreamMmap *mstream;
 	struct stat st;
-	off_t start;
+	goffset start;
 	char *map;
 	
 	start = lseek (fd, 0, SEEK_CUR);
--- gmime/gmime-stream-null.c
+++ gmime/gmime-stream-null.c
@@ -169,7 +169,7 @@
 stream_seek (GMimeStream *stream, goffset offset, GMimeSeekWhence whence)
 {
 	GMimeStreamNull *null = (GMimeStreamNull *) stream;
-	off_t bound_end;
+	goffset bound_end;
 	
 	bound_end = stream->bound_end != -1 ? stream->bound_end : null->written;
 	
@@ -201,7 +201,7 @@
 stream_length (GMimeStream *stream)
 {
 	GMimeStreamNull *null = GMIME_STREAM_NULL (stream);
-	off_t bound_end;
+	goffset bound_end;
 	
 	bound_end = stream->bound_end != -1 ? stream->bound_end : null->written;
 	
--- gmime/gmime-stream.h
+++ gmime/gmime-stream.h
@@ -59,9 +59,9 @@
 	/* Note: these are private fields!! */
 	GMimeStream *super_stream;
 	
-	off_t position;
-	off_t bound_start;
-	off_t bound_end;
+	goffset position;
+	goffset bound_start;
+	goffset bound_end;
 };
 
 struct _GMimeStreamClass {
--- tests/test-cat.c
+++ tests/test-cat.c
@@ -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 */
+	goffset pstart, pend;  /* start/end offsets of the part stream */
+	goffset wstart, wend;  /* corresponding start/end offsets of the whole stream */
 	char filename[256];
 };
 
@@ -115,7 +115,7 @@
 	size_t nread, size;
 	ssize_t n;
 	
-	v(fprintf (stdout, "Matching original stream (" OFF_T " -> " OFF_T ") with %s (" OFF_T ", " OFF_T ")... ",
+	v(fprintf (stdout, "Matching original stream (" G_GINT64_FORMAT " -> " G_GINT64_FORMAT ") with %s (" G_GINT64_FORMAT ", " G_GINT64_FORMAT ")... ",
 		   orig->position, orig->bound_end, filename, dup->position, dup->bound_end));
 	
 	if (orig->bound_end != -1) {
@@ -196,7 +196,7 @@
 	cat = g_mime_stream_cat_new ();
 	
 	while (part != NULL) {
-		d(fprintf (stderr, "adding %s start=" OFF_T ", end=" OFF_T "...\n",
+		d(fprintf (stderr, "adding %s start=" G_GINT64_FORMAT ", end=" G_GINT64_FORMAT "...\n",
 			   part->filename, part->pstart, part->pend));
 		
 		if ((fd = open (part->filename, O_CREAT | O_TRUNC | O_WRONLY, 0666)) == -1) {
@@ -268,7 +268,7 @@
 	cat = g_mime_stream_cat_new ();
 	
 	while (part != NULL) {
-		d(fprintf (stderr, "adding %s start=" OFF_T ", end=" OFF_T "...\n",
+		d(fprintf (stderr, "adding %s start=" G_GINT64_FORMAT ", end=" G_GINT64_FORMAT "...\n",
 			   part->filename, part->pstart, part->pend));
 		
 		if ((fd = open (part->filename, O_RDONLY)) == -1) {
@@ -298,7 +298,7 @@
 	struct _StreamPart *part = parts;
 	GMimeStream *stream, *cat;
 	Exception *ex;
-	off_t offset;
+	goffset offset;
 	size_t size;
 	ssize_t n;
 	int fd;
@@ -315,7 +315,7 @@
 	cat = g_mime_stream_cat_new ();
 	
 	while (part != NULL) {
-		d(fprintf (stderr, "adding %s start=" OFF_T ", end=" OFF_T "...\n",
+		d(fprintf (stderr, "adding %s start=" G_GINT64_FORMAT ", end=" G_GINT64_FORMAT "...\n",
 			   part->filename, part->pstart, part->pend));
 		
 		if ((fd = open (part->filename, O_RDONLY)) == -1) {
@@ -332,16 +332,16 @@
 	}
 	
 	/* calculate a random seek offset to compare at */
-	offset = (off_t) (size * (rand () / (RAND_MAX + 1.0)));
+	offset = (goffset) (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",
+		ex = exception_new ("could not seek to " G_GINT64_FORMAT " in original stream: %s",
 				    offset, strerror (errno));
 		throw (ex);
 	}
 	
 	if (g_mime_stream_seek (cat, offset, GMIME_STREAM_SEEK_SET) == -1) {
-		ex = exception_new ("could not seek to " OFF_T ": %s",
+		ex = exception_new ("could not seek to " G_GINT64_FORMAT ": %s",
 				    offset, strerror (errno));
 		throw (ex);
 	}
@@ -358,7 +358,7 @@
 {
 	GMimeStream *stream, *cat, *sub1, *sub2;
 	struct _StreamPart *part = parts;
-	off_t start, end;
+	goffset start, end;
 	Exception *ex;
 	size_t size;
 	ssize_t n;
@@ -376,7 +376,7 @@
 	cat = g_mime_stream_cat_new ();
 	
 	while (part != NULL) {
-		d(fprintf (stderr, "adding %s start=" OFF_T ", end=" OFF_T "...\n",
+		d(fprintf (stderr, "adding %s start=" G_GINT64_FORMAT ", end=" G_GINT64_FORMAT "...\n",
 			   part->filename, part->pstart, part->pend));
 		
 		if ((fd = open (part->filename, O_RDONLY)) == -1) {
@@ -393,9 +393,9 @@
 	}
 	
 	/* calculate a random start/end offsets */
-	start = (off_t) (size * (rand () / (RAND_MAX + 1.0)));
+	start = (goffset) (size * (rand () / (RAND_MAX + 1.0)));
 	if (rand () % 2)
-		end = start + (off_t) ((size - start) * (rand () / (RAND_MAX + 1.0)));
+		end = start + (goffset) ((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;
+	goffset 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 = (goffset) 0; /* FIXME: we could make this a random offset */
 		n->pend = n->pstart + len;
 		n->wend = start + len;
 		n->wstart = start;
--- tests/test-mbox.c
+++ tests/test-mbox.c
@@ -82,18 +82,18 @@
 
 
 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, goffset offset, gpointer user_data)
 {
 	GMimeStream *stream = user_data;
 	
-	g_mime_stream_printf (stream, OFF_T ": %s: %s\n", offset, header, value);
+	g_mime_stream_printf (stream, G_GINT64_FORMAT ": %s: %s\n", offset, header, value);
 }
 
 static void
 test_parser (GMimeParser *parser, GMimeStream *stream)
 {
 	GMimeMessage *message;
-	off_t start, end;
+	goffset start, end;
 	int nmsg = 0;
 	char *from;
 	
@@ -104,7 +104,7 @@
 		
 		end = g_mime_parser_tell (parser);
 		
-		g_mime_stream_printf (stream, "message offsets: " OFF_T ", " OFF_T "\n", start, end);
+		g_mime_stream_printf (stream, "message offsets: " G_GINT64_FORMAT ", " G_GINT64_FORMAT "\n", start, end);
 		
 		from = g_mime_parser_get_from (parser);
 		g_mime_stream_printf (stream, "%s\n", from);
--- tests/test-streams.c
+++ tests/test-streams.c
@@ -53,7 +53,7 @@
 	size_t nread, size;
 	ssize_t n;
 	
-	v(fprintf (stdout, "Matching original stream (" OFF_T " -> " OFF_T ") with %s (" OFF_T ", " OFF_T ")... ",
+	v(fprintf (stdout, "Matching original stream (" G_GINT64_FORMAT " -> " G_GINT64_FORMAT ") with %s (" G_GINT64_FORMAT ", " G_GINT64_FORMAT ")... ",
 		   streams[0]->position, streams[0]->bound_end, filename,
 		   streams[1]->position, streams[1]->bound_end));
 	
@@ -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, goffset start, goffset 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, goffset start, goffset 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, goffset start, goffset 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, goffset start, goffset 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, goffset start, goffset 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 *, goffset, goffset);
 
 static struct {
 	const char *what;
@@ -427,7 +427,7 @@
 {
 	char inpath[256], outpath[256], *p, *q, *o;
 	struct dirent *dent;
-	off_t start, end;
+	goffset 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;
+	goffset start, end;
 	struct stat st;
 	size_t len;
 	int fd, i;
@@ -559,7 +559,7 @@
 	
 	for (i = 0; i < 64; i++) {
 	retry:
-		start = (off_t) (st.st_size * (rand () / (RAND_MAX + 1.0)));
+		start = (goffset) (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;
@@ -568,7 +568,7 @@
 			end = start + len;
 		}
 		
-		sprintf (p, OFF_T "," OFF_T, start, end);
+		sprintf (p, G_GINT64_FORMAT "," G_GINT64_FORMAT, start, end);
 		
 		if ((fd = open (output, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0666)) == -1)
 			goto retry;
--- util/url-scanner.h
+++ util/url-scanner.h
@@ -30,8 +30,8 @@
 typedef struct {
 	const char *pattern;
 	const char *prefix;
-	off_t um_so;
-	off_t um_eo;
+	goffset um_so;
+	goffset um_eo;
 } urlmatch_t;
 
 typedef gboolean (*UrlScanFunc) (const char *in, const char *pos, const char *inend, urlmatch_t *match);

Places

File gmime-no-off_t-at-all.patch of Package gmime (Revision 4b79ee49d6afdc1574784f455a012ffa)

Places