From aa86731f7416c8739f206d0c5eca52e2a6d3c827 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 4 Apr 2011 09:47:31 -0700 Subject: [PATCH] * intervals.c (interval_deletion_adjustment): Return unsigned value. All uses changed. --- src/ChangeLog | 2 ++ src/intervals.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b72f17ab7b9..9bd13eaeb7b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,8 @@ 2011-04-04 Paul Eggert * intervals.c (graft_intervals_into_buffer): Mark var as used. + (interval_deletion_adjustment): Return unsigned value. + All uses changed. * process.c (list_processes_1, create_pty, read_process_output): (exec_sentinel): Remove vars that were set but not used. diff --git a/src/intervals.c b/src/intervals.c index 92c84554510..729e6810f74 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -1312,7 +1312,7 @@ delete_interval (register INTERVAL i) Do this by recursing down TREE to the interval in question, and deleting the appropriate amount of text. */ -static EMACS_INT +static EMACS_UINT interval_deletion_adjustment (register INTERVAL tree, register EMACS_INT from, register EMACS_INT amount) { @@ -1324,7 +1324,7 @@ interval_deletion_adjustment (register INTERVAL tree, register EMACS_INT from, /* Left branch */ if (relative_position < LEFT_TOTAL_LENGTH (tree)) { - EMACS_INT subtract = interval_deletion_adjustment (tree->left, + EMACS_UINT subtract = interval_deletion_adjustment (tree->left, relative_position, amount); tree->total_length -= subtract; @@ -1335,7 +1335,7 @@ interval_deletion_adjustment (register INTERVAL tree, register EMACS_INT from, else if (relative_position >= (TOTAL_LENGTH (tree) - RIGHT_TOTAL_LENGTH (tree))) { - EMACS_INT subtract; + EMACS_UINT subtract; relative_position -= (tree->total_length - RIGHT_TOTAL_LENGTH (tree)); @@ -1377,7 +1377,7 @@ static void adjust_intervals_for_deletion (struct buffer *buffer, EMACS_INT start, EMACS_INT length) { - register EMACS_INT left_to_delete = length; + register EMACS_UINT left_to_delete = length; register INTERVAL tree = BUF_INTERVALS (buffer); Lisp_Object parent; EMACS_INT offset; -- 2.39.5