Cast strlen of constant down to avoid argument widening. Change an abs
to labs based on the arguments.
This commit is contained in:
parent
2ce54a14d1
commit
519f354c13
6
gnu/dist/texinfo/info/session.c
vendored
6
gnu/dist/texinfo/info/session.c
vendored
@ -1,4 +1,4 @@
|
|||||||
/* $NetBSD: session.c,v 1.5 2008/09/02 08:41:51 christos Exp $ */
|
/* $NetBSD: session.c,v 1.6 2014/02/27 18:09:18 joerg Exp $ */
|
||||||
|
|
||||||
/* session.c -- user windowing interface to Info.
|
/* session.c -- user windowing interface to Info.
|
||||||
Id: session.c,v 1.16 2004/12/14 00:15:36 karl Exp
|
Id: session.c,v 1.16 2004/12/14 00:15:36 karl Exp
|
||||||
@ -2020,7 +2020,7 @@ nearest_xref (REFERENCE **xref_list, long int pos)
|
|||||||
/* See how far POS is from this xref. Take into account the
|
/* See how far POS is from this xref. Take into account the
|
||||||
`*Note' that begins the xref, since as far as the user is
|
`*Note' that begins the xref, since as far as the user is
|
||||||
concerned, that's where it starts. */
|
concerned, that's where it starts. */
|
||||||
delta = MIN (labs (pos - (xref->start - strlen (INFO_XREF_LABEL))),
|
delta = MIN (labs (pos - (xref->start - (long)strlen (INFO_XREF_LABEL))),
|
||||||
labs (pos - xref->end));
|
labs (pos - xref->end));
|
||||||
|
|
||||||
/* It's the <= instead of < that makes us choose the forward xref
|
/* It's the <= instead of < that makes us choose the forward xref
|
||||||
@ -2247,7 +2247,7 @@ info_menu_or_ref_item (WINDOW *window, int count,
|
|||||||
{
|
{
|
||||||
/* ref->end is more accurate estimate of position
|
/* ref->end is more accurate estimate of position
|
||||||
for menus than ref->start. Go figure. */
|
for menus than ref->start. Go figure. */
|
||||||
int dist = abs (window->point - ref->end);
|
int dist = labs (window->point - ref->end);
|
||||||
|
|
||||||
if (dist < min_dist)
|
if (dist < min_dist)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user