Ticket #1977: 1977-unifying-some-declarations-in-edit-dir.patch

edit/bookmark.c

@@ -60 +60 @@
 }
 
 /* returns the first bookmark on or before this line */
-struct _book_mark *book_mark_find (WEdit * edit, int line)
+struct _book_mark *book_mark_find (WEdit * edit, long line)
 {
     struct _book_mark *p;
     if (!edit->book_mark) {
@@ -104 +104 @@
 }
 
 /* returns true if a bookmark exists at this line of color c */
-int book_mark_query_color (WEdit * edit, int line, int c)
+int book_mark_query_color (WEdit * edit, long line, int c)
 {
     struct _book_mark *p;
     if (!edit->book_mark)
@@ -120 +120 @@
 
 /* insert a bookmark at this line */
 void
-book_mark_insert (WEdit *edit, int line, int c)
+book_mark_insert (WEdit *edit, long line, int c)
 {
     struct _book_mark *p, *q;
     p = book_mark_find (edit, line);
@@ -149 +149 @@
 
 /* remove a bookmark if there is one at this line matching this color - c of -1 clear all */
 /* returns non-zero on not-found */
-int book_mark_clear (WEdit * edit, int line, int c)
+int book_mark_clear (WEdit * edit, long line, int c)
 {
     struct _book_mark *p, *q;
     int r = 1;
@@ -201 +201 @@
 }
 
 /* shift down bookmarks after this line */
-void book_mark_inc (WEdit * edit, int line)
+void book_mark_inc (WEdit * edit, long line)
 {
     if (edit->book_mark) {
         struct _book_mark *p;
@@ -213 +213 @@
 }
 
 /* shift up bookmarks after this line */
-void book_mark_dec (WEdit * edit, int line)
+void book_mark_dec (WEdit * edit, long line)
 {
     if (edit->book_mark) {
         struct _book_mark *p;

edit/edit-impl.h

@@ -166 +166 @@
 void edit_scroll_screen_over_cursor (WEdit * edit);
 void edit_render_keypress (WEdit * edit);
 void edit_scroll_upward (WEdit * edit, unsigned long i);
-void edit_scroll_downward (WEdit * edit, int i);
-void edit_scroll_right (WEdit * edit, int i);
-void edit_scroll_left (WEdit * edit, int i);
+void edit_scroll_downward (WEdit * edit, long i);
+void edit_scroll_right (WEdit * edit, long i);
+void edit_scroll_left (WEdit * edit, long i);
 void edit_move_up (WEdit * edit, unsigned long i, int scroll);
 void edit_move_down (WEdit * edit, unsigned long i, int scroll);
 void edit_move_to_prev_col (WEdit *edit, long p);
@@ -260 +260 @@
 void edit_get_syntax_color (WEdit * edit, long byte_index, int *color);
 
 
-void book_mark_insert (WEdit * edit, int line, int c);
-int book_mark_query_color (WEdit * edit, int line, int c);
-int book_mark_query_all (WEdit * edit, int line, int *c);
-struct _book_mark *book_mark_find (WEdit * edit, int line);
-int book_mark_clear (WEdit * edit, int line, int c);
+struct _book_mark *book_mark_find (WEdit * edit, long line);
+int book_mark_clear (WEdit * edit, long line, int c);
+int book_mark_query_color (WEdit * edit, long line, int c);
+int book_mark_query_all (WEdit * edit, long line, int *c);
+void book_mark_inc (WEdit * edit, long line);
+void book_mark_dec (WEdit * edit, long line);
+void book_mark_insert (WEdit * edit, long line, int c);
 void book_mark_flush (WEdit * edit, int c);
-void book_mark_inc (WEdit * edit, int line);
-void book_mark_dec (WEdit * edit, int line);
 
 int line_is_blank (WEdit *edit, long line);
 int edit_indent_width (WEdit *edit, long p);

edit/edit-widget.h

@@ -16 +16 @@
 #define N_LINE_CACHES 32
 
 struct _book_mark {
-    int line;                   /* line number */
+    long line;                  /* line number */
     int c;                      /* color */
     struct _book_mark *next;
     struct _book_mark *prev;

edit/edit.c

@@ -706 +706 @@
         line = edit->curs_line;
     }
     edit_move_to_prev_col (edit, edit_bol (edit, edit->curs1));
-    edit_move_display (edit, line - (edit->num_widget_lines / 2));
+    edit_move_display (edit, line - (long) (edit->num_widget_lines / 2));
 }
 
 /* Save cursor position in the file */
@@ -1204 +1204 @@
 static void
 edit_insert_over (WEdit * edit)
 {
-    int i;
+    long i;
 
     for ( i = 0; i < edit->over_col; i++ ) {
         edit_insert (edit, ' ');
@@ -1358 +1358 @@
 int
 edit_move_backward_lots (WEdit *edit, long increment)
 {
-    int r, s, t;
+    long r, s, t;
     unsigned char *p = NULL;
 
     if (increment > edit->curs1)
@@ -1682 +1682 @@
 
 
 /* returns 1 if could scroll, 0 otherwise */
-void edit_scroll_downward (WEdit * edit, int i)
+void edit_scroll_downward (WEdit * edit, long i)
 {
-    int lines_below;
-    lines_below = edit->total_lines - edit->start_line - (edit->num_widget_lines - 1);
+    long lines_below;
+    lines_below = edit->total_lines - edit->start_line - ((long) edit->num_widget_lines) - 1;
     if (lines_below > 0) {
         if (i > lines_below)
             i = lines_below;
@@ -1697 +1697 @@
     edit_update_curs_row (edit);
 }
 
-void edit_scroll_right (WEdit * edit, int i)
+void edit_scroll_right (WEdit * edit, long i)
 {
     edit->force |= REDRAW_PAGE;
     edit->force &= (0xfff - REDRAW_CHAR_ONLY);
     edit->start_col -= i;
 }
 
-void edit_scroll_left (WEdit * edit, int i)
+void edit_scroll_left (WEdit * edit, long i)
 {
     if (edit->start_col) {
         edit->start_col += i;
@@ -1731 +1731 @@
 void
 edit_move_to_prev_col (WEdit * edit, long p)
 {
-    int prev = edit->prev_col;
-    int over = edit->over_col;
+    long prev = edit->prev_col;
+    long over = edit->over_col;
     edit_cursor_move (edit, edit_move_forward3 (edit, p, prev + edit->over_col, 0) - edit->curs1);
 
     if (option_cursor_beyond_eol) {
@@ -1782 +1782 @@
 
 /* returns the offset of line i */
 static long
-edit_find_line (WEdit *edit, int line)
+edit_find_line (WEdit *edit, long line)
 {
     int i, j = 0;
     int m = 2000000000;
@@ -1859 +1859 @@
    before a non-blank line is reached */
 static void edit_move_down_paragraph (WEdit * edit, int scroll)
 {
-    int i;
+    long i;
     if (edit->curs_line >= edit->total_lines - 1) {
         i = edit->total_lines;
     } else {
@@ -2597 +2597 @@
         edit->highlight = 1;
     } else {                    /* any other command */
         if (edit->highlight)
-            edit_mark_cmd (edit, 0);    /* clear */
+            edit_mark_cmd (edit, 0);    /* marking on */
         edit->highlight = 0;
     }
 
@@ -2970 +2970 @@
                                                       edit->curs_line);
             if (p->next) {
                 p = p->next;
-                if (p->line >= edit->start_line + edit->num_widget_lines
+                if (p->line >= (edit->start_line + (long) edit->num_widget_lines)
                     || p->line < edit->start_line)
                     edit_move_display (edit,
-                                       p->line -
-                                       edit->num_widget_lines / 2);
+                                       p->line - ((long) (edit->num_widget_lines / 2)));
                 edit_move_to_line (edit, p->line);
             }
         }
@@ -2988 +2987 @@
                 if (p->prev)
                     p = p->prev;
             if (p->line >= 0) {
-                if (p->line >= edit->start_line + edit->num_widget_lines
+                if (p->line >= (edit->start_line + (long) edit->num_widget_lines)
                     || p->line < edit->start_line)
                     edit_move_display (edit,
-                                       p->line -
-                                       edit->num_widget_lines / 2);
+                                       p->line - ((long) (edit->num_widget_lines / 2)));
                 edit_move_to_line (edit, p->line);
             }
         }

edit/edit.h

@@ -67 +67 @@
 void edit_stack_init (void);
 void edit_stack_free (void);
 
-int edit_file (const char *_file, int line);
+int edit_file (const char *_file, long line);
 
 const char *edit_get_file_name (const WEdit *edit);
 int edit_get_curs_col (const WEdit *edit);

edit/editcmd.c

@@ -124 +124 @@
 static int
 edit_search_cmd_callback(const void *user_data, gsize char_offset)
 {
-    return edit_get_byte ((WEdit * )user_data, (long) char_offset);
+    return edit_get_byte ((WEdit * ) user_data, (long) char_offset);
 }
 
 void edit_help_cmd (WEdit * edit)
@@ -2015 +2015 @@
     line = l;
     if (l < 0)
         l = edit->total_lines + l + 2;
-    edit_move_display (edit, l - edit->num_widget_lines / 2 - 1);
+    edit_move_display (edit, l - ((long) (edit->num_widget_lines / 2 - 1)));
     edit_move_to_line (edit, l - 1);
     edit->force |= REDRAW_COMPLETELY;
     g_free (f);

edit/editdraw.c

@@ -219 +219 @@
 /* this scrolls the text so that cursor is on the screen */
 void edit_scroll_screen_over_cursor (WEdit * edit)
 {
-    int p;
-    int outby;
+    long p, outby;
     int b_extreme, t_extreme, l_extreme, r_extreme;
 
     if (edit->num_widget_lines <= 0 || edit->num_widget_columns <= 0)
@@ -251 +250 @@
     }
     p = edit_get_col (edit) + edit->over_col;
     edit_update_curs_row (edit);
-    outby = p + edit->start_col - edit->num_widget_columns + 1 + (r_extreme + edit->found_len);
+    p = p + edit->start_col + 1;
+    outby = p - ((long) (edit->num_widget_columns + r_extreme + edit->found_len));
     if (outby > 0)
         edit_scroll_right (edit, outby);
-    outby = l_extreme - p - edit->start_col;
+    outby = ((long) l_extreme) - p - edit->start_col;
     if (outby > 0)
         edit_scroll_left (edit, outby);
     p = edit->curs_row;
-    outby = p - edit->num_widget_lines + 1 + b_extreme;
+    outby = p + 1 - ((long) (edit->num_widget_lines + b_extreme));
     if (outby > 0)
         edit_scroll_downward (edit, outby);
-    outby = t_extreme - p;
+    outby = ((long) t_extreme) - p;
     if (outby > 0)
         edit_scroll_upward (edit, outby);
     edit_update_curs_row (edit);
@@ -287 +287 @@
     int x1 = start_col + EDIT_TEXT_HORIZONTAL_OFFSET + option_line_state_width;
     int y = row + EDIT_TEXT_VERTICAL_OFFSET;
     int cols_to_skip = abs (x);
+    int i = 1;
 
     tty_setcolor (EDITOR_NORMAL_COLOR);
 
@@ -307 +308 @@
     }
 
     if (option_line_state) {
-        int i;
-        for (i = 0; i < LINE_STATE_WIDTH; i++)
-            if (status[i] == '\0')
-                status[i] = ' ';
+        int n;
+        for (n = 0; n < LINE_STATE_WIDTH; n++)
+            if (status[n] == '\0')
+                status[n] = ' ';
 
         tty_setcolor (LINE_STATE_COLOR);
         edit_move (x1 + FONT_OFFSET_X - option_line_state_width, y + FONT_OFFSET_Y);
@@ -319 +320 @@
 
     edit_move (x1 + FONT_OFFSET_X, y + FONT_OFFSET_Y);
     p = line;
-    int i = 1;
     while (p->ch) {
         int style;
         unsigned int textchar;

edit/editwidget.c

@@ -227 +227 @@
 }
 
 int
-edit_file (const char *_file, int line)
+edit_file (const char *_file, long line)
 {
     static gboolean made_directory = FALSE;
     Dlg_head *edit_dlg;

edit/wordproc.c

@@ -119 +119 @@
 static long
 end_paragraph (WEdit *edit, int force)
 {
-    int i;
+    long i;
     for (i = edit->curs_line + 1; i <= edit->total_lines; i++) {
         if (line_is_blank (edit, i)) {
             i--;
@@ -352 +352 @@
         return;
     p = begin_paragraph (edit, force);
     q = end_paragraph (edit, force);
+    if (q <= p)
+        return;
     indent = test_indent (edit, p, q);
     t = get_paragraph (edit, p, q, indent, &size);
     if (!t)