mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace magic numbers with enum.

This commit is contained in:
Michael Drake 2013-07-24 23:03:16 +01:00
parent 81b4c61ae3
commit c6820e8402
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
desktop/global_history.c
View File

@ -27,7 +27,6 @@
#include "utils/utils.h" #include "utils/utils.h"
#include "utils/log.h" #include "utils/log.h"
#define N_FIELDS 5
#define N_DAYS 28 #define N_DAYS 28
#define N_SEC_PER_DAY (60 * 60 * 24) #define N_SEC_PER_DAY (60 * 60 * 24)
@ -45,6 +44,15 @@ enum global_history_folders {
GH_N_FOLDERS GH_N_FOLDERS
}; };
enum global_history_fields {
GH_TITLE,
GH_URL,
GH_LAST_VISIT,
GH_VISITS,
GH_PERIOD,
N_FIELDS
};
struct global_history_folder { struct global_history_folder {
treeview_node *folder; treeview_node *folder;
struct treeview_field_data data; struct treeview_field_data data;
@ -259,13 +267,14 @@ static nserror global_history_create_treeview_field_data(
char *last_visited2; char *last_visited2;
int len; int len;
e->data[0].field = gh_ctx.fields[0].field; e->data[GH_TITLE].field = gh_ctx.fields[GH_TITLE].field;
e->data[0].value = strdup(title); e->data[GH_TITLE].value = strdup(title);
e->data[0].value_len = (e->data[0].value != NULL) ? strlen(title) : 0; e->data[GH_TITLE].value_len = (e->data[GH_TITLE].value != NULL) ?
strlen(title) : 0;
e->data[1].field = gh_ctx.fields[1].field; e->data[GH_URL].field = gh_ctx.fields[GH_URL].field;
e->data[1].value = nsurl_access(e->url); e->data[GH_URL].value = nsurl_access(e->url);
e->data[1].value_len = nsurl_length(e->url); e->data[GH_URL].value_len = nsurl_length(e->url);
last_visited = ctime(&data->last_visit); last_visited = ctime(&data->last_visit);
last_visited2 = strdup(last_visited); last_visited2 = strdup(last_visited);
@ -274,9 +283,9 @@ static nserror global_history_create_treeview_field_data(
last_visited2[24] = '\0'; last_visited2[24] = '\0';
} }
e->data[2].field = gh_ctx.fields[2].field; e->data[GH_LAST_VISIT].field = gh_ctx.fields[GH_LAST_VISIT].field;
e->data[2].value = last_visited2; e->data[GH_LAST_VISIT].value = last_visited2;
e->data[2].value_len = (last_visited2 != NULL) ? 24 : 0; e->data[GH_LAST_VISIT].value_len = (last_visited2 != NULL) ? 24 : 0;
len = snprintf(buffer, 16, "%u", data->visits); len = snprintf(buffer, 16, "%u", data->visits);
if (len == 16) { if (len == 16) {
@ -284,9 +293,9 @@ static nserror global_history_create_treeview_field_data(
buffer[len] = '\0'; buffer[len] = '\0';
} }
e->data[3].field = gh_ctx.fields[3].field; e->data[GH_VISITS].field = gh_ctx.fields[GH_VISITS].field;
e->data[3].value = strdup(buffer); e->data[GH_VISITS].value = strdup(buffer);
e->data[3].value_len = len; e->data[GH_VISITS].value_len = len;
return NSERROR_OK; return NSERROR_OK;
} }
@ -442,9 +451,9 @@ static void global_history_delete_entry_internal(
} }
/* Destroy fields */ /* Destroy fields */
free((void *)e->data[0].value); /* Eww */ free((void *)e->data[GH_TITLE].value); /* Eww */
free((void *)e->data[2].value); /* Eww */ free((void *)e->data[GH_LAST_VISIT].value); /* Eww */
free((void *)e->data[3].value); /* Eww */ free((void *)e->data[GH_VISITS].value); /* Eww */
nsurl_unref(e->url); nsurl_unref(e->url);
/* Destroy entry */ /* Destroy entry */
@ -512,47 +521,47 @@ static nserror global_history_initialise_entry_fields(void)
for (i = 0; i < N_FIELDS; i++) for (i = 0; i < N_FIELDS; i++)
gh_ctx.fields[i].field = NULL; gh_ctx.fields[i].field = NULL;
gh_ctx.fields[0].flags = TREE_FLAG_DEFAULT; gh_ctx.fields[GH_TITLE].flags = TREE_FLAG_DEFAULT;
label = "TreeviewLabelTitle"; label = "TreeviewLabelTitle";
label = messages_get(label); label = messages_get(label);
if (lwc_intern_string(label, strlen(label), if (lwc_intern_string(label, strlen(label),
&gh_ctx.fields[0].field) != &gh_ctx.fields[GH_TITLE].field) !=
lwc_error_ok) { lwc_error_ok) {
goto error; goto error;
} }
gh_ctx.fields[1].flags = TREE_FLAG_NONE; gh_ctx.fields[GH_URL].flags = TREE_FLAG_NONE;
label = "TreeviewLabelURL"; label = "TreeviewLabelURL";
label = messages_get(label); label = messages_get(label);
if (lwc_intern_string(label, strlen(label), if (lwc_intern_string(label, strlen(label),
&gh_ctx.fields[1].field) != &gh_ctx.fields[GH_URL].field) !=
lwc_error_ok) { lwc_error_ok) {
goto error; goto error;
} }
gh_ctx.fields[2].flags = TREE_FLAG_SHOW_NAME; gh_ctx.fields[GH_LAST_VISIT].flags = TREE_FLAG_SHOW_NAME;
label = "TreeviewLabelLastVisit"; label = "TreeviewLabelLastVisit";
label = messages_get(label); label = messages_get(label);
if (lwc_intern_string(label, strlen(label), if (lwc_intern_string(label, strlen(label),
&gh_ctx.fields[2].field) != &gh_ctx.fields[GH_LAST_VISIT].field) !=
lwc_error_ok) { lwc_error_ok) {
goto error; goto error;
} }
gh_ctx.fields[3].flags = TREE_FLAG_SHOW_NAME; gh_ctx.fields[GH_VISITS].flags = TREE_FLAG_SHOW_NAME;
label = "TreeviewLabelVisits"; label = "TreeviewLabelVisits";
label = messages_get(label); label = messages_get(label);
if (lwc_intern_string(label, strlen(label), if (lwc_intern_string(label, strlen(label),
&gh_ctx.fields[3].field) != &gh_ctx.fields[GH_VISITS].field) !=
lwc_error_ok) { lwc_error_ok) {
goto error; goto error;
} }
gh_ctx.fields[4].flags = TREE_FLAG_DEFAULT; gh_ctx.fields[GH_PERIOD].flags = TREE_FLAG_DEFAULT;
label = "TreeviewLabelPeriod"; label = "TreeviewLabelPeriod";
label = messages_get(label); label = messages_get(label);
if (lwc_intern_string(label, strlen(label), if (lwc_intern_string(label, strlen(label),
&gh_ctx.fields[4].field) != &gh_ctx.fields[GH_PERIOD].field) !=
lwc_error_ok) { lwc_error_ok) {
return false; return false;
} }