Refactor functions in images processing.

diff --git a/src/libmime/images.c b/src/libmime/images.c
index d60ecf2a0a118fc8e2d79d43fa5b4471be5f90c6..30150c33593655a91742f2f2a3d72c2ab32aa481 100644 (file)
--- a/src/libmime/images.c
+++ b/src/libmime/images.c
@@ -37,7 +37,7 @@ static void process_image (struct rspamd_task *task, struct mime_part *part);
 
 
 void
-process_images (struct rspamd_task *task)
+rspamd_images_process (struct rspamd_task *task)
 {
        guint i;
        struct mime_part *part;
@@ -52,7 +52,7 @@ process_images (struct rspamd_task *task)
 
 }
 
-static enum known_image_types
+static enum rspamd_image_type
 detect_image_type (GByteArray *data)
 {
        if (data->len > sizeof (png_signature) / sizeof (png_signature[0])) {
@@ -230,7 +230,7 @@ process_image (struct rspamd_task *task, struct mime_part *part)
 
        if (img != NULL) {
                debug_task ("detected %s image of size %ud x %ud in message <%s>",
-                       image_type_str (img->type),
+                       rspamd_image_type_str (img->type),
                        img->width, img->height,
                        task->message_id);
                img->filename = part->filename;
@@ -286,7 +286,7 @@ process_image (struct rspamd_task *task, struct mime_part *part)
 }
 
 const gchar *
-image_type_str (enum known_image_types type)
+rspamd_image_type_str (enum rspamd_image_type type)
 {
        switch (type) {
        case IMAGE_TYPE_PNG:
@@ -301,9 +301,6 @@ image_type_str (enum known_image_types type)
        case IMAGE_TYPE_BMP:
                return "BMP";
                break;
-       case IMAGE_TYPE_HTML:
-               return "HTML";
-               break;
        default:
                break;
        }

diff --git a/src/libmime/images.h b/src/libmime/images.h
index 5fcfdbc4cf085a704cc9040b76d835dfb982854c..5d01e6f7501812ecdf318be4da32426cd5b70509 100644 (file)
--- a/src/libmime/images.h
+++ b/src/libmime/images.h
@@ -4,31 +4,33 @@
 #include "config.h"
 #include "main.h"
 
-enum known_image_types {
-       IMAGE_TYPE_PNG,
+struct html_image;
+
+enum rspamd_image_type {
+       IMAGE_TYPE_PNG = 0,
        IMAGE_TYPE_JPG,
        IMAGE_TYPE_GIF,
        IMAGE_TYPE_BMP,
-       IMAGE_TYPE_HTML,
-       IMAGE_TYPE_UNKNOWN = 9000
+       IMAGE_TYPE_UNKNOWN
 };
 
 struct rspamd_image {
-       enum known_image_types type;
+       enum rspamd_image_type type;
        GByteArray *data;
        guint32 width;
        guint32 height;
        const gchar *filename;
+       struct html_image *html_image;
 };
 
 /*
  * Process images from a worker task
  */
-void process_images (struct rspamd_task *task);
+void rspamd_images_process (struct rspamd_task *task);
 
 /*
  * Get textual representation of an image's type
  */
-const gchar * image_type_str (enum known_image_types type);
+const gchar * rspamd_image_type_str (enum rspamd_image_type type);
 
 #endif /* IMAGES_H_ */

diff --git a/src/libmime/message.c b/src/libmime/message.c
index 46662b3fd30a7edf48322efbcf5525f6ac39fa3b..96e22545cd4ec3b180f7562727aac0171e776c97 100644 (file)
--- a/src/libmime/message.c
+++ b/src/libmime/message.c
@@ -1506,7 +1506,7 @@ rspamd_message_parse (struct rspamd_task *task)
                                        task->raw_headers_content.len);
                }
 
-               process_images (task);
+               rspamd_images_process (task);
 
                /* Parse received headers */
                first =

diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c
index 90aea155d88cc477c761b58a685002fc07fcfd53..89f21b7cb64d52cd33581a0dbb4b26785fbf3e19 100644 (file)
--- a/src/lua/lua_task.c
+++ b/src/lua/lua_task.c
@@ -2034,7 +2034,7 @@ lua_image_get_type (lua_State *L)
        struct rspamd_image *img = lua_check_image (L);
 
        if (img != NULL) {
-               lua_pushstring (L, image_type_str (img->type));
+               lua_pushstring (L, rspamd_image_type_str (img->type));
        }
        else {
                lua_pushnil (L);