Cleaned code a little.

Removed typedefs from header files where they are only used internal.
Removed none used macros and changed all macro names to upper case.

diff --git a/src/dom.h b/src/dom.h
index c9ba2c2..bfabe6d 100644 (file)
--- a/src/dom.h
+++ b/src/dom.h
@@ -32,16 +32,6 @@
 #define HtmlInputElement    WebKitDOMHTMLInputElement
 #define HtmlTextareaElement WebKitDOMHTMLTextAreaElement
 
-// style 
-#define style_compare_property(style, name, value)    (!strcmp(webkit_dom_css_style_declaration_get_property_value(style, name), value))
-
-typedef struct {
-    gulong left;
-    gulong right;
-    gulong top;
-    gulong bottom;
-} DomBoundingRect;
-
 void dom_check_auto_insert(WebKitWebView *view);
 void dom_clear_focus(WebKitWebView *view);
 gboolean dom_focus_input(WebKitWebView *view);

diff --git a/src/history.c b/src/history.c
index fd598f2..058d660 100644 (file)
--- a/src/history.c
+++ b/src/history.c
@@ -275,7 +275,7 @@ static void write_to_file(GList *list, const char *file)
 {
     FILE *f;
     if ((f = fopen(file, "w"))) {
-        file_lock_set(fileno(f), F_WRLCK);
+        FILE_LOCK_SET(fileno(f), F_WRLCK);
 
         /* overwrite the history file with new unique history items */
         for (GList *link = list; link; link = link->next) {
@@ -287,7 +287,7 @@ static void write_to_file(GList *list, const char *file)
             }
         }
 
-        file_lock_set(fileno(f), F_UNLCK);
+        FILE_LOCK_SET(fileno(f), F_UNLCK);
         fclose(f);
     }
 }

diff --git a/src/keybind.c b/src/keybind.c
index 15cec61..2fea49e 100644 (file)
--- a/src/keybind.c
+++ b/src/keybind.c
@@ -23,6 +23,15 @@
 #include "command.h"
 #include "completion.h"
 
+typedef struct {
+    int     mode;        /* mode maks for allowed browser modes */
+    guint   modkey;
+    guint   modmask;     /* modemask for the kayval */
+    guint   keyval;
+    Command func;
+    Arg     arg;
+} Keybind;
+
 extern VbCore vb;
 
 static GSList  *keys;

diff --git a/src/keybind.h b/src/keybind.h
index 0c7470a..5e58d8d 100644 (file)
--- a/src/keybind.h
+++ b/src/keybind.h
@@ -24,15 +24,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkkeysyms-compat.h>
 
-typedef struct {
-    int     mode;        /* mode maks for allowed browser modes */
-    guint   modkey;
-    guint   modmask;     /* modemask for the kayval */
-    guint   keyval;
-    Command func;
-    Arg     arg;
-} Keybind;
-
 void keybind_init(void);
 void keybind_cleanup(void);
 gboolean keybind_add_from_string(char *keys, const char *command, const Mode mode);

diff --git a/src/main.h b/src/main.h
index d8f8c05..f856909 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -61,13 +61,13 @@
 #define PRIMARY_CLIPBOARD() gtk_clipboard_get(GDK_SELECTION_PRIMARY)
 #define SECONDARY_CLIPBOARD() gtk_clipboard_get(GDK_NONE)
 
-#define OVERWRITE_STRING(t, s) if (t) {g_free(t); t = NULL;} t = g_strdup(s);
+#define OVERWRITE_STRING(t, s) {if (t) {g_free(t); t = NULL;} t = g_strdup(s);}
 
 #define IS_ESCAPE_KEY(k, s) ((k == GDK_Escape && s == 0) || (k == GDK_c && s == GDK_CONTROL_MASK))
 #define CLEAN_STATE_WITH_SHIFT(e) ((e)->state & (GDK_MOD1_MASK|GDK_MOD4_MASK|GDK_SHIFT_MASK|GDK_CONTROL_MASK))
 #define CLEAN_STATE(e)            ((e)->state & (GDK_MOD1_MASK|GDK_MOD4_MASK|GDK_CONTROL_MASK))
 
-#define file_lock_set(fd, cmd) \
+#define FILE_LOCK_SET(fd, cmd) \
 { \
     struct flock lock = { .l_type = cmd, .l_start = 0, .l_whence = SEEK_SET, .l_len = 0}; \
     fcntl(fd, F_SETLK, lock); \
@@ -86,7 +86,7 @@
 #define VB_GTK_STATE_NORMAL             GTK_STATE_FLAG_NORMAL
 #define VB_GTK_STATE_ACTIVE             GTK_STATE_FLAG_ACTIVE
 #define VB_GTK_STATE_SELECTED           GTK_STATE_FLAG_SELECTED
-#define VB_WIDGET_SET_STATE(w, s)       gtk_widget_set_state_flags(w, s, true)
+#define VB_WIDGET_SET_STATE(w, s)       (gtk_widget_set_state_flags(w, s, true))
 
 #else
 
@@ -102,7 +102,7 @@
 #define VB_GTK_STATE_NORMAL             GTK_STATE_NORMAL
 #define VB_GTK_STATE_ACTIVE             GTK_STATE_ACTIVE
 #define VB_GTK_STATE_SELECTED           GTK_STATE_SELECTED
-#define VB_WIDGET_SET_STATE(w, s)       gtk_widget_set_state(w, s)
+#define VB_WIDGET_SET_STATE(w, s)       (gtk_widget_set_state(w, s))
 #endif
 
 /* enums */

diff --git a/src/util.c b/src/util.c
index b3b79d5..f3cb2df 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -166,13 +166,13 @@ gboolean util_file_append(const char *file, const char *format, ...)
     FILE *f;
 
     if ((f = fopen(file, "a+"))) {
-        file_lock_set(fileno(f), F_WRLCK);
+        FILE_LOCK_SET(fileno(f), F_WRLCK);
 
         va_start(args, format);
         vfprintf(f, format, args);
         va_end(args);
 
-        file_lock_set(fileno(f), F_UNLCK);
+        FILE_LOCK_SET(fileno(f), F_UNLCK);
         fclose(f);
 
         return true;
@@ -195,7 +195,7 @@ gboolean util_file_prepend(const char *file, const char *format, ...)
 
     content = util_get_file_contents(file, NULL);
     if ((f = fopen(file, "w"))) {
-        file_lock_set(fileno(f), F_WRLCK);
+        FILE_LOCK_SET(fileno(f), F_WRLCK);
 
         va_start(args, format);
         /* write new content to the file */
@@ -205,7 +205,7 @@ gboolean util_file_prepend(const char *file, const char *format, ...)
         /* append previous file content */
         fputs(content, f);
 
-        file_lock_set(fileno(f), F_UNLCK);
+        FILE_LOCK_SET(fileno(f), F_UNLCK);
         fclose(f);
 
         res = true;