mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-30 06:58:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

PVS/V547: dead code #10459

Browse Source
This commit is contained in:
Bartosz Miera
2019-07-13 12:30:52 +02:00
committed by Justin M. Keyes
parent 4731027447
commit 06826139e1
1 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/nvim/sign.c
View File

@@ -83,11 +83,8 @@ static signgroup_T * sign_group_ref(const char_u *groupname)
hi = hash_lookup(&sg_table, (char *)groupname, STRLEN(groupname), hash); hi = hash_lookup(&sg_table, (char *)groupname, STRLEN(groupname), hash);
if (HASHITEM_EMPTY(hi)) { if (HASHITEM_EMPTY(hi)) {
// new group // new group
group = (signgroup_T *)xmalloc( group = xmalloc((unsigned)(sizeof(signgroup_T) + STRLEN(groupname)));
(unsigned)(sizeof(signgroup_T) + STRLEN(groupname)));
if (group == NULL) {
return NULL;
}
STRCPY(group->sg_name, groupname); STRCPY(group->sg_name, groupname);
group->refcount = 1; group->refcount = 1;
group->next_sign_id = 1; group->next_sign_id = 1;
@@ -188,10 +185,6 @@ static void insert_sign(
newsign->typenr = typenr; newsign->typenr = typenr;
if (group != NULL) { if (group != NULL) {
newsign->group = sign_group_ref(group); newsign->group = sign_group_ref(group);
if (newsign->group == NULL) {
xfree(newsign);
return;
}
} else { } else {
newsign->group = NULL; newsign->group = NULL;
} }
@@ -1347,8 +1340,8 @@ static void sign_getinfo(sign_T *sp, dict_T *retdict)
/// Otherwise, return information about the specified sign. /// Otherwise, return information about the specified sign.
void sign_getlist(const char_u *name, list_T *retlist) void sign_getlist(const char_u *name, list_T *retlist)
{ {
sign_T *sp = first_sign; sign_T *sp = first_sign;
dict_T *dict; dict_T *dict;
if (name != NULL) { if (name != NULL) {
sp = sign_find(name, NULL); sp = sign_find(name, NULL);
@@ -1358,9 +1351,7 @@ void sign_getlist(const char_u *name, list_T *retlist)
} }
for (; sp != NULL && !got_int; sp = sp->sn_next) { for (; sp != NULL && !got_int; sp = sp->sn_next) {
if ((dict = tv_dict_alloc()) == NULL) { dict = tv_dict_alloc();
return;
}
tv_list_append_dict(retlist, dict); tv_list_append_dict(retlist, dict);
sign_getinfo(sp, dict); sign_getinfo(sp, dict);
@@ -1374,14 +1365,13 @@ void sign_getlist(const char_u *name, list_T *retlist)
list_T *get_buffer_signs(buf_T *buf) list_T *get_buffer_signs(buf_T *buf)
FUNC_ATTR_NONNULL_RET FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_RET FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
{ {
signlist_T *sign; signlist_T *sign;
dict_T *d; dict_T *d;
list_T *const l = tv_list_alloc(kListLenMayKnow); list_T *const l = tv_list_alloc(kListLenMayKnow);
FOR_ALL_SIGNS_IN_BUF(buf, sign) { FOR_ALL_SIGNS_IN_BUF(buf, sign) {
if ((d = sign_get_info(sign)) != NULL) { d = sign_get_info(sign);
tv_list_append_dict(l, d); tv_list_append_dict(l, d);
}
} }
return l; return l;
} }
@@ -1394,21 +1384,16 @@ static void sign_get_placed_in_buf(
const char_u *sign_group, const char_u *sign_group,
list_T *retlist) list_T *retlist)
{ {
dict_T *d; dict_T *d;
list_T *l; list_T *l;
signlist_T *sign; signlist_T *sign;
dict_T *sdict;
if ((d = tv_dict_alloc()) == NULL) { d = tv_dict_alloc();
return;
}
tv_list_append_dict(retlist, d); tv_list_append_dict(retlist, d);
tv_dict_add_nr(d, S_LEN("bufnr"), (long)buf->b_fnum); tv_dict_add_nr(d, S_LEN("bufnr"), (long)buf->b_fnum);
if ((l = tv_list_alloc(kListLenMayKnow)) == NULL) { l = tv_list_alloc(kListLenMayKnow);
return;
}
tv_dict_add_list(d, S_LEN("signs"), l); tv_dict_add_list(d, S_LEN("signs"), l);
FOR_ALL_SIGNS_IN_BUF(buf, sign) { FOR_ALL_SIGNS_IN_BUF(buf, sign) {
@@ -1419,9 +1404,7 @@ static void sign_get_placed_in_buf(
|| (sign_id == 0 && lnum == sign->lnum) || (sign_id == 0 && lnum == sign->lnum)
|| (lnum == 0 && sign_id == sign->id) || (lnum == 0 && sign_id == sign->id)
|| (lnum == sign->lnum && sign_id == sign->id)) { || (lnum == sign->lnum && sign_id == sign->id)) {
if ((sdict = sign_get_info(sign)) != NULL) { tv_list_append_dict(l, sign_get_info(sign));
tv_list_append_dict(l, sdict);
}
} }
} }
} }