Skip to content

Commit

Permalink
Drop non-portable libedit's el_data_set() and el_data_get() for
Browse files Browse the repository at this point in the history
private data.

We can set/get private data with the documented el_get() and
el_set() so there's no need for our local extensions, which
never received much use anyway.

While here, also re-arrange the call to term_init_arrow. This
was left over from r89735 but is not required anymore.

This changes reduce differences against NetBSD's libedit.

MFC after:	2 months
  • Loading branch information
pgiffuni committed Jul 26, 2012
1 parent dcf3898 commit b54693d
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 32 deletions.
24 changes: 0 additions & 24 deletions lib/libedit/el.c
Expand Up @@ -473,30 +473,6 @@ el_get(EditLine *el, int op, ...)
return (rv);
}

/* el_data_get():
* Set user private data.
*/
public void
el_data_set (el, data)
EditLine *el;
void *data;
{
el->el_data = data;

return;
}

/* el_data_get():
* Return user private data.
*/
public void *
el_data_get (el)
EditLine *el;
{
if (el->el_data)
return (el->el_data);
return (NULL);
}

/* el_line():
* Return editing info
Expand Down
7 changes: 0 additions & 7 deletions lib/libedit/histedit.h
Expand Up @@ -154,13 +154,6 @@ int el_source(EditLine *, const char *);
*/
void el_resize(EditLine *);


/*
* Set user private data.
*/
void el_data_set(EditLine *, void *);
void * el_data_get(EditLine *);

/*
* User-defined function interface.
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/libedit/term.c
Expand Up @@ -340,8 +340,8 @@ term_init(EditLine *el)
if (el->el_term.t_val == NULL)
return (-1);
(void) memset(el->el_term.t_val, 0, T_val * sizeof(int));
term_init_arrow(el);
(void) term_set(el, NULL);
term_init_arrow(el);
return (0);
}

Expand Down

0 comments on commit b54693d

Please sign in to comment.