mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-23 04:26:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename function arguments to avoid using 'new'.

Browse Source
This commit is contained in:
Michael Drake 2014-02-19 14:08:52 +00:00
parent 71cb70065e
commit 32a522241f
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
desktop/browser_history.c
View File

@ -443,36 +443,39 @@ nserror browser_window_history_create(struct browser_window *bw)
/**
* Clone a bw's history tree for new bw
*
* \param bw browser window with history to clone.
* \param new browser window to make cloned history for.
* \param existing browser window with history to clone.
* \param clone browser window to make cloned history for.
*
* \return NSERROR_OK or appropriate error otherwise
*/
nserror browser_window_history_clone(const struct browser_window *bw,
struct browser_window *new)
nserror browser_window_history_clone(const struct browser_window *existing,
struct browser_window *clone)
{
struct history *new_history;
new->history = NULL;
clone->history = NULL;
if (bw == NULL || bw->history == NULL || bw->history->start == NULL)
return browser_window_history_create(new);
if (existing == NULL || existing->history == NULL ||
existing->history->start == NULL)
/* Nothing to clone, create new history for clone window */
return browser_window_history_create(clone);
/* Make cloned history */
new_history = malloc(sizeof *new_history);
if (!new_history)
return NSERROR_NOMEM;
new->history = new_history;
memcpy(new_history, bw->history, sizeof *new_history);
clone->history = new_history;
memcpy(new_history, existing->history, sizeof *new_history);
new_history->start = browser_window_history__clone_entry(new_history,
new_history->start);
if (!new_history->start) {
LOG(("Insufficient memory to clone history"));
warn_user("NoMemory", 0);
browser_window_history_destroy(new);
new->history = NULL;
browser_window_history_destroy(clone);
clone->history = NULL;
return NSERROR_NOMEM;
}

4
desktop/browser_history.h
View File

@ -34,8 +34,8 @@ struct history_entry;
struct redraw_context;
nserror browser_window_history_create(struct browser_window *bw);
nserror browser_window_history_clone(const struct browser_window *bw,
struct browser_window *new);
nserror browser_window_history_clone(const struct browser_window *existing,
struct browser_window *clone);
void browser_window_history_add(struct browser_window *bw,
struct hlcache_handle *content, lwc_string *frag_id);
void browser_window_history_update(struct browser_window *bw,