File minicom-2.2-getline.diff of Package minicom

Overview Repositories Revisions Requests Users Attributes Meta

File minicom-2.2-getline.diff of Package minicom (Revision 11f33509aa661ffbc251d78e7d711eab)

Currently displaying revision 11f33509aa661ffbc251d78e7d711eab , Show latest

--- src/minicom.c
+++ src/minicom.c
@@ -159,7 +159,7 @@
 #endif /*SIGTSTP*/
 
 /* Get a line from either window or scroll back buffer. */
-static ELM *getline(WIN *w, int no)
+static ELM *l_getline(WIN *w, int no)
 {
   int i;
   static ELM outofrange[MAXCOLS] = {{0,0,0}};
@@ -197,7 +197,7 @@
 
   w->direct = 0;
   for (f = 0; f < w->ys; f++)
-    wdrawelm(w, f, getline(w, y++));
+    wdrawelm(w, f, l_getline(w, y++));
   if (r)
     wredraw(w, 1);
   w->direct = 1;
@@ -219,7 +219,7 @@
   tmp_line[0]='\0';
   w->direct = 0;
   for (f = 0; f < w->ys; f++) {
-    tmp_e = getline(w, y++);
+    tmp_e = l_getline(w, y++);
 
     /* First we "accumulate" the line into a variable */
     wdrawelm_var(w, tmp_e, tmp_line);
@@ -316,7 +316,7 @@
 
   for (next_line = hit_line; next_line <= all_lines; next_line++) {
     /* we do 'something' here... :-) */
-    tmp_e = getline(w_hist, next_line);
+    tmp_e = l_getline(w_hist, next_line);
 
     /*
      * First we "accumulate" the line into a variable.
@@ -371,9 +371,9 @@
 static void drawcite(WIN *w, int y, int citey, int start, int end)
 {
   if (y+citey >= start && y+citey <= end)
-    wdrawelm_inverse(w, y, getline(w, y+citey));
+    wdrawelm_inverse(w, y, l_getline(w, y+citey));
   else
-    wdrawelm(w, y, getline(w, y+citey));
+    wdrawelm(w, y, l_getline(w, y+citey));
 }
 
 static void drawcite_whole(WIN *w, int y, int start, int end)
@@ -392,7 +392,7 @@
   for (y=start; y<=end; y++) {
     vt_send('>');
     vt_send(' ');
-    tmp_e = getline(w, y);
+    tmp_e = l_getline(w, y);
     wdrawelm_var(w, tmp_e, tmp_line);
     tmp_line[w->xs] = 0;
     for (x = w->xs-1; x >= 0; x--) {
@@ -592,7 +592,7 @@
         if (citemode) {
           inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
         } else {
-          tmp_e = getline(b_us, y);
+          tmp_e = l_getline(b_us, y);
           if (wcslen(look_for) > 1) {
             /* quick scan for pattern match */
             wdrawelm_var(b_us, tmp_e, tmp_line);
@@ -603,9 +603,9 @@
         }
 
         if (inverse)
-          wdrawelm_inverse(b_us, 0, getline(b_us, y));
+          wdrawelm_inverse(b_us, 0, l_getline(b_us, y));
         else
-          wdrawelm(b_us, 0, getline(b_us, y));
+          wdrawelm(b_us, 0, l_getline(b_us, y));
         if (citemode)
           wlocate(b_us, 0, cite_y);
         wflush();
@@ -640,7 +640,7 @@
         if (citemode) {
           inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
         } else {
-          tmp_e = getline(b_us, y + b_us->ys - 1);
+          tmp_e = l_getline(b_us, y + b_us->ys - 1);
           if (wcslen(look_for) > 1) {
             /* quick scan for pattern match */
             wdrawelm_var(b_us, tmp_e, tmp_line);
@@ -652,10 +652,10 @@
 
         if (inverse)
           wdrawelm_inverse(b_us, b_us->ys - 1,
-                           getline(b_us, y + b_us->ys - 1));
+                           l_getline(b_us, y + b_us->ys - 1));
         else
           wdrawelm(b_us, b_us->ys - 1,
-                   getline(b_us, y + b_us->ys - 1));
+                   l_getline(b_us, y + b_us->ys - 1));
         if (citemode)
           wlocate(b_us, 0, cite_y);
         wflush();
@@ -745,7 +745,7 @@
         wlocate(b_st, 0, 0);
         wprintf(b_st, hline);
         wredraw(b_st, 1);
-        wdrawelm_inverse(b_us, cite_y, getline(b_us, cite_ystart));
+        wdrawelm_inverse(b_us, cite_y, l_getline(b_us, cite_ystart));
         wlocate(b_us, 0, cite_y);
         break;
       case K_ESC:

Places

File minicom-2.2-getline.diff of Package minicom (Revision 11f33509aa661ffbc251d78e7d711eab)

Places