2005-02-27 [colin] 1.0.1cvs19.4

	* src/procheader.c
	* src/procheader.h
		Fix prototypes. Patch by Alfons

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index c0c1546f29693e178b79c8ba5f0ff9eef2cf7e29..afe692a012a0f26476a3f4d849e6a5df5d42452f 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-02-27 [colin]     1.0.1cvs19.4
+
+       * src/procheader.c
+       * src/procheader.h
+               Fix prototypes. Patch by Alfons
+

 2005-02-27 [colin]     1.0.1cvs19.3
 
        * src/compose.c
 2005-02-27 [colin]     1.0.1cvs19.3
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index ec964418b579fb7113e27b25d41667e513d2e381..023bab2c36e9bac6d5c6f661cc689e779888b9ac 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -404,3 +404,4 @@
 ( cvs diff -u -r 1.2504.2.49 -r 1.2504.2.50 ChangeLog.claws; cvs diff -u -r 1.654.2.437 -r 1.654.2.438 configure.ac; cvs diff -u -r 1.105.2.17 -r 1.105.2.18 src/prefs_account.c; cvs diff -u -r 1.52.2.9 -r 1.52.2.10 src/prefs_folder_item.c; cvs diff -u -r 1.12.2.16 -r 1.12.2.17 src/gtk/prefswindow.c; cvs diff -u -r 1.7.2.2 -r 1.7.2.3 src/gtk/prefswindow.h; ) > 1.0.1cvs19.1.patchset
 ( cvs diff -u -r 1.395.2.57 -r 1.395.2.58 src/summaryview.c; ) > 1.0.1cvs19.2.patchset
 ( cvs diff -u -r 1.382.2.108 -r 1.382.2.109 src/compose.c; ) > 1.0.1cvs19.3.patchset
 ( cvs diff -u -r 1.2504.2.49 -r 1.2504.2.50 ChangeLog.claws; cvs diff -u -r 1.654.2.437 -r 1.654.2.438 configure.ac; cvs diff -u -r 1.105.2.17 -r 1.105.2.18 src/prefs_account.c; cvs diff -u -r 1.52.2.9 -r 1.52.2.10 src/prefs_folder_item.c; cvs diff -u -r 1.12.2.16 -r 1.12.2.17 src/gtk/prefswindow.c; cvs diff -u -r 1.7.2.2 -r 1.7.2.3 src/gtk/prefswindow.h; ) > 1.0.1cvs19.1.patchset
 ( cvs diff -u -r 1.395.2.57 -r 1.395.2.58 src/summaryview.c; ) > 1.0.1cvs19.2.patchset
 ( cvs diff -u -r 1.382.2.108 -r 1.382.2.109 src/compose.c; ) > 1.0.1cvs19.3.patchset

+( cvs diff -u -r 1.47.2.15 -r 1.47.2.16 src/procheader.c; cvs diff -u -r 1.11.2.2 -r 1.11.2.3 src/procheader.h; ) > 1.0.1cvs19.4.patchset

diff --git a/configure.ac b/configure.ac
index 63388720893d2e301eac5f980fe5842d5fbf6b19..c86c317b45f402ba40dbcb25a3a5e4a7ba8fdc9d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=19
 EXTRA_RELEASE=
 BINARY_AGE=0
 EXTRA_VERSION=19
 EXTRA_RELEASE=

-EXTRA_GTK2_VERSION=.3
+EXTRA_GTK2_VERSION=.4

 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/procheader.c b/src/procheader.c
index b612ffde2e4d6d7f6d658b61ab40181ed2d54c59..49b2d737396dda3ad8bb37184b4c827fcbc6107a 100644 (file)
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -37,18 +37,18 @@
 
 #define BUFFSIZE       8192
 
 
 #define BUFFSIZE       8192
 

-typedef char *(*getlinefunc)(char *, int, void *);
-typedef int (*peekcharfunc)(void *);
-typedef int (*getcharfunc)(void *);
-typedef gint (*get_one_field_func)(gchar *, gint, void *, HeaderEntry[]);
+typedef char *(*getlinefunc) (char *, size_t, void *);
+typedef int (*peekcharfunc) (void *);
+typedef int (*getcharfunc) (void *);
+typedef gint (*get_one_field_func) (gchar *, size_t, void *, HeaderEntry[]);

 
 

-static gint string_get_one_field(gchar *buf, gint len, char **str,
+static gint string_get_one_field(gchar *buf, size_t len, char **str,

                                 HeaderEntry hentry[]);
 
                                 HeaderEntry hentry[]);
 

-static char *string_getline(char *buf, int len, char **str);
+static char *string_getline(char *buf, size_t len, char **str);

 static int string_peekchar(char **str);
 static int file_peekchar(FILE *fp);
 static int string_peekchar(char **str);
 static int file_peekchar(FILE *fp);

-static gint generic_get_one_field(gchar *buf, gint len, void *data,
+static gint generic_get_one_field(gchar *buf, size_t len, void *data,

                                  HeaderEntry hentry[],
                                  getlinefunc getline, 
                                  peekcharfunc peekchar,
                                  HeaderEntry hentry[],
                                  getlinefunc getline, 
                                  peekcharfunc peekchar,


@@ -57,7 +57,7 @@ static MsgInfo *parse_stream(void *data, gboolean isstring, MsgFlags flags,
                             gboolean full, gboolean decrypted);
 
 
                             gboolean full, gboolean decrypted);
 
 

-gint procheader_get_one_field(gchar *buf, gint len, FILE *fp,
+gint procheader_get_one_field(gchar *buf, size_t len, FILE *fp,

                              HeaderEntry hentry[])
 {
        return generic_get_one_field(buf, len, fp, hentry,
                              HeaderEntry hentry[])
 {
        return generic_get_one_field(buf, len, fp, hentry,


@@ -65,7 +65,7 @@ gint procheader_get_one_field(gchar *buf, gint len, FILE *fp,
                                     TRUE);
 }
 
                                     TRUE);
 }
 

-static gint string_get_one_field(gchar *buf, gint len, char **str,
+static gint string_get_one_field(gchar *buf, size_t len, char **str,

                                 HeaderEntry hentry[])
 {
        return generic_get_one_field(buf, len, str, hentry,
                                 HeaderEntry hentry[])
 {
        return generic_get_one_field(buf, len, str, hentry,


@@ -74,7 +74,7 @@ static gint string_get_one_field(gchar *buf, gint len, char **str,
                                     TRUE);
 }
 
                                     TRUE);
 }
 

-static char *string_getline(char *buf, int len, char **str)
+static char *string_getline(char *buf, size_t len, char **str)

 {
        if (!**str)
                return NULL;
 {
        if (!**str)
                return NULL;


@@ -97,7 +97,7 @@ static int file_peekchar(FILE *fp)
        return ungetc(getc(fp), fp);
 }
 
        return ungetc(getc(fp), fp);
 }
 

-static gint generic_get_one_field(gchar *buf, gint len, void *data,
+static gint generic_get_one_field(gchar *buf, size_t len, void *data,

                          HeaderEntry *hentry,
                          getlinefunc getline, peekcharfunc peekchar,
                          gboolean unfold)
                          HeaderEntry *hentry,
                          getlinefunc getline, peekcharfunc peekchar,
                          gboolean unfold)


@@ -157,7 +157,7 @@ static gint generic_get_one_field(gchar *buf, gint len, void *data,
        return hnum;
 }
 
        return hnum;
 }
 

-gint procheader_get_one_field_asis(gchar *buf, gint len, FILE *fp)
+gint procheader_get_one_field_asis(gchar *buf, size_t len, FILE *fp)

 {
        return generic_get_one_field(buf, len, fp, NULL,
                                     (getlinefunc)fgets, 
 {
        return generic_get_one_field(buf, len, fp, NULL,
                                     (getlinefunc)fgets, 

diff --git a/src/procheader.h b/src/procheader.h
index 11cd3644977e21e9d193d0422319830659dfd9c1..4aaf509f31dfbfb57709a07866adaf7e84a6c003 100644 (file)
--- a/src/procheader.h
+++ b/src/procheader.h
@@ -43,14 +43,14 @@ struct _Header
 };
 
 gint procheader_get_one_field          (gchar          *buf,
 };
 
 gint procheader_get_one_field          (gchar          *buf,

-                                        gint            len,
+                                        size_t          len,

                                         FILE           *fp,
                                         HeaderEntry     hentry[]);
 gint procheader_get_one_field_asis     (gchar          *buf,
                                         FILE           *fp,
                                         HeaderEntry     hentry[]);
 gint procheader_get_one_field_asis     (gchar          *buf,

-                                        gint            len,
+                                        size_t          len,

                                         FILE           *fp);
 gchar *procheader_get_unfolded_line    (gchar          *buf,
                                         FILE           *fp);
 gchar *procheader_get_unfolded_line    (gchar          *buf,

-                                        gint            len,
+                                        size_t          len,

                                         FILE           *fp);
 
 #if 0
                                         FILE           *fp);
 
 #if 0