* src/procmime.c

	clean up (2)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e26ff256b73d9aee6fdcce23f168c814dfdf03bb..d9860e4b9d556e54c11d60786e45673d51bdd74c 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-02-26 [alfons]    0.9.9claws30
+
+       * src/procmime.c
+               clean up (2)
+
 2004-02-26 [alfons]    0.9.9claws29
 
        * src/procmime.c

diff --git a/configure.ac b/configure.ac
index 071671da2a461c91ce5f9f3d55fb437d9e6bbb30..8e2e799942b6e47ae6b48d1e47989e1e14c5c33d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=29
+EXTRA_VERSION=30
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/procmime.c b/src/procmime.c
index e8e3262b0b64c55b077b94021947725bf57e0f1f..3489a01221c3fd14419f10d4becf713493387f8c 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -77,7 +77,7 @@ static gboolean free_func(GNode *node, gpointer data)
 {
        MimeInfo *mimeinfo = (MimeInfo *) node->data;
 
-       if(mimeinfo->tmpfile)
+       if (mimeinfo->tmpfile)
                unlink(mimeinfo->filename);
        g_free(mimeinfo->filename);
 
@@ -193,7 +193,7 @@ MimeInfo *procmime_scan_message(MsgInfo *msginfo)
        MimeInfo *mimeinfo;
 
        filename = procmsg_get_message_file(msginfo);
-       if(!filename)
+       if (!filename)
                return NULL;
        if (msginfo->folder->stype != F_QUEUE && 
            msginfo->folder->stype != F_DRAFT)
@@ -233,11 +233,11 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
 
        g_return_val_if_fail(mimeinfo != NULL, FALSE);
 
-       if(mimeinfo->encoding_type == ENC_BINARY)
+       if (mimeinfo->encoding_type == ENC_BINARY)
                return TRUE;
 
        infp = fopen(mimeinfo->filename, "rb");
-       if(!infp) {
+       if (!infp) {
                perror("fopen");
                return FALSE;
        }
@@ -279,7 +279,7 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
                gboolean flag = FALSE;
 
                while ((ftell(infp) < readend) && (fgets(buf, sizeof(buf), infp) != NULL)) {
-                       if(!flag && strncmp(buf,"begin ", 6)) continue;
+                       if (!flag && strncmp(buf,"begin ", 6)) continue;
 
                        if (flag) {
                                len = fromuutobits(outbuf, buf);
@@ -302,7 +302,7 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
        fclose(infp);
 
        stat(tmpfilename, &statbuf);
-       if(mimeinfo->tmpfile)
+       if (mimeinfo->tmpfile)
                unlink(mimeinfo->filename);
        g_free(mimeinfo->filename);
        mimeinfo->filename = tmpfilename;
@@ -323,7 +323,7 @@ gint procmime_get_part(const gchar *outfile, MimeInfo *mimeinfo)
        g_return_val_if_fail(outfile != NULL, -1);
        g_return_val_if_fail(mimeinfo != NULL, -1);
 
-       if(mimeinfo->encoding_type != ENC_BINARY && !procmime_decode_content(mimeinfo))
+       if (mimeinfo->encoding_type != ENC_BINARY && !procmime_decode_content(mimeinfo))
                return -1;
 
        if ((infp = fopen(mimeinfo->filename, "rb")) == NULL) {
@@ -439,7 +439,7 @@ void renderer_write_config(void)
 
        g_free(rcpath);
 
-       for(cur = renderer_list ; cur != NULL ; cur = cur->next) {
+       for (cur = renderer_list ; cur != NULL ; cur = cur->next) {
                struct ContentRenderer * renderer;
                renderer = cur->data;
                fprintf(pfile->fp, "%s %s\n", renderer->content_type,
@@ -498,7 +498,7 @@ FILE *procmime_get_text_content(MimeInfo *mimeinfo)
 
        content_type = g_strdup_printf("%s/%s", procmime_get_type_str(mimeinfo->type),
                mimeinfo->subtype);
-       for(cur = renderer_list ; cur != NULL ; cur = cur->next) {
+       for (cur = renderer_list ; cur != NULL ; cur = cur->next) {
                struct ContentRenderer * cr;
 
                cr = cur->data;
@@ -972,7 +972,7 @@ void procmime_parse_message_rfc822(MimeInfo *mimeinfo)
        FILE *fp;
        gint mime_major, mime_minor, a;
 
-       if(mimeinfo->encoding_type != ENC_BINARY && 
+       if (mimeinfo->encoding_type != ENC_BINARY && 
           mimeinfo->encoding_type != ENC_7BIT && 
           mimeinfo->encoding_type != ENC_8BIT)
                procmime_decode_content(mimeinfo);
@@ -1088,11 +1088,11 @@ static void add_to_mimeinfo_parameters(gchar **parts, MimeInfo *mimeinfo)
                        g_strstrip(parameters_parts[0]);
                        g_strstrip(parameters_parts[1]);
                        g_strdown(parameters_parts[0]);
-                       if(parameters_parts[1][0] == '"')
+                       if (parameters_parts[1][0] == '"')
                                extract_quote(parameters_parts[1], '"');
                        else if ((firstspace = strchr(parameters_parts[1], ' ')) != NULL)
                                *firstspace = '\0';
-                       if(g_hash_table_lookup(mimeinfo->parameters,
+                       if (g_hash_table_lookup(mimeinfo->parameters,
                                               parameters_parts[0]) == NULL)
                                g_hash_table_insert(mimeinfo->parameters,
                                                    g_strdup(parameters_parts[0]),
@@ -1126,7 +1126,7 @@ static void procmime_parse_content_type(const gchar *content_type, MimeInfo *mim
        if ((str == NULL) || (str[0] == '\0') || (strchr(str, '/') == NULL)) {
                mimeinfo->type = MIMETYPE_TEXT;
                mimeinfo->subtype = g_strdup("plain");
-               if(g_hash_table_lookup(mimeinfo->parameters,
+               if (g_hash_table_lookup(mimeinfo->parameters,
                                       "charset") == NULL)
                        g_hash_table_insert(mimeinfo->parameters,
                                            g_strdup("charset"),
@@ -1221,7 +1221,7 @@ void procmime_parse_mimepart(MimeInfo *parent,
        } else {
                mimeinfo->type = MIMETYPE_TEXT;
                mimeinfo->subtype = g_strdup("plain");
-               if(g_hash_table_lookup(mimeinfo->parameters,
+               if (g_hash_table_lookup(mimeinfo->parameters,
                                       "charset") == NULL)
                        g_hash_table_insert(mimeinfo->parameters, g_strdup("charset"), g_strdup("us-ascii"));
        }
@@ -1281,7 +1281,7 @@ static gboolean output_func(GNode *node, gpointer data)
        MimeInfo *mimeinfo = (MimeInfo *) node->data;
 
        depth = g_node_depth(node);
-       for(i = 0; i < depth; i++)
+       for (i = 0; i < depth; i++)
                printf("    ");
        printf("%s/%s (offset:%d length:%d encoding: %d)\n", typenames[mimeinfo->type], mimeinfo->subtype, mimeinfo->offset, mimeinfo->length, mimeinfo->encoding_type);
 
@@ -1336,7 +1336,7 @@ MimeInfo *procmime_scan_queue_file(gchar *filename)
        g_return_val_if_fail(filename != NULL, NULL);
 
        /* Open file */
-       if((fp = fopen(filename, "rb")) == NULL)
+       if ((fp = fopen(filename, "rb")) == NULL)
                return NULL;
        /* Skip queue header */
        while (fgets(buf, sizeof(buf), fp) != NULL)