[Minor] Improve style from the previous merge

diff --git a/src/libserver/html.c b/src/libserver/html.c
index c831dc14e2aa269a7dc9af35623fedcad76e651b..1f11f0cb25328fd86e1816a76a8e0d9a651dee6a 100644 (file)
--- a/src/libserver/html.c
+++ b/src/libserver/html.c
@@ -2377,28 +2377,10 @@ rspamd_html_check_displayed_url (rspamd_mempool_t *pool,
                return;
        }
 
-       url->visible_part = rspamd_mempool_alloc0(pool, dest->len - href_offset+1);
-       gchar *current_processed_char = dest->data + href_offset;
-       gchar *current_char_in_struct = url->visible_part;
-       gboolean previous_char_was_space = false;
-
-       while (current_processed_char < (gchar*) dest->data + dest->len) {
-               if (g_ascii_isspace(*current_processed_char)) {
-                       if (previous_char_was_space) {
-                               current_processed_char++;
-                               continue;
-                       }
-                       previous_char_was_space = true;
-                       *current_char_in_struct = ' ';
-               } else {
-                       *current_char_in_struct = *current_processed_char;
-                       previous_char_was_space = false;
-               }
-               current_char_in_struct++;
-               current_processed_char++;
-       }
-       *current_char_in_struct = '\0';
-       url->visible_partlen = current_char_in_struct - url->visible_part;
+       url->visible_part = rspamd_mempool_alloc (pool, dest->len - href_offset + 1);
+       rspamd_strlcpy (url->visible_part, dest->data + href_offset,
+                       dest->len - href_offset + 1);
+       g_strstrip (url->visible_part);
 
        rspamd_html_url_is_phished (pool, url,
                        dest->data + href_offset,

diff --git a/src/libserver/url.h b/src/libserver/url.h
index ad09c33ec8bcb891b700ac152156f1b17b887638..2cf80df4b922ecad247b5cd215a3f244629a9e96 100644 (file)
--- a/src/libserver/url.h
+++ b/src/libserver/url.h
@@ -63,7 +63,6 @@ struct rspamd_url {
        guint tldlen;
        guint urllen;
        guint rawlen;
-       guint visible_partlen;
 
        enum rspamd_url_flags flags;
        guint count;

diff --git a/src/lua/lua_url.c b/src/lua/lua_url.c
index 58c6a83bea48cc9c2616b4b8190db91d5ca0f39f..9bc984da309f7e98d65459522af03548e6d8b178 100644 (file)
--- a/src/lua/lua_url.c
+++ b/src/lua/lua_url.c
@@ -663,8 +663,8 @@ lua_url_get_visible (lua_State *L)
        LUA_TRACE_POINT;
        struct rspamd_lua_url *url = lua_check_url (L, 1);
 
-       if (url != NULL) {
-               lua_pushlstring (L, url->url->visible_part, url->url->visible_partlen);
+       if (url != NULL && url->url->visible_part) {
+               lua_pushstring (L, url->url->visible_part);
        }
        else {
                lua_pushnil (L);