Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-dialup/minicom/files: minicom-2.3-getline-rename.patch
Date: Sat, 20 Jun 2009 10:37:00
Message-Id: E1MHxwQ-0005mT-7o@stork.gentoo.org
1 mrness 09/06/20 10:36:58
2
3 Modified: minicom-2.3-getline-rename.patch
4 Log:
5 Update getline-rename.patch (#270452). Migrate to EAPI 2.
6 (Portage version: 2.1.6.13/cvs/Linux x86_64, RepoMan options: --force)
7
8 Revision Changes Path
9 1.2 net-dialup/minicom/files/minicom-2.3-getline-rename.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/minicom/files/minicom-2.3-getline-rename.patch?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/minicom/files/minicom-2.3-getline-rename.patch?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/minicom/files/minicom-2.3-getline-rename.patch?r1=1.1&r2=1.2
14
15 Index: minicom-2.3-getline-rename.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/net-dialup/minicom/files/minicom-2.3-getline-rename.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- minicom-2.3-getline-rename.patch 19 May 2009 21:58:45 -0000 1.1
22 +++ minicom-2.3-getline-rename.patch 20 Jun 2009 10:36:58 -0000 1.2
23 @@ -1,11 +1,11 @@
24 --- minicom-2.3.orig/src/minicom.c 2008-02-02 23:49:53.000000000 +0100
25 -+++ minicom-2.3/src/minicom.c 2009-05-19 22:09:13.121029740 +0200
26 ++++ minicom-2.3/src/minicom.c 2009-06-08 09:42:32.151729441 +0200
27 @@ -167,7 +167,7 @@
28 #endif /*SIGTSTP*/
29
30 /* Get a line from either window or scroll back buffer. */
31 -static ELM *getline(WIN *w, int no)
32 -+static ELM *_getline(WIN *w, int no)
33 ++static ELM *minic_getline(WIN *w, int no)
34 {
35 int i;
36 static ELM outofrange[MAXCOLS] = {{0,0,0}};
37 @@ -14,7 +14,7 @@
38 w->direct = 0;
39 for (f = 0; f < w->ys; f++)
40 - mc_wdrawelm(w, f, getline(w, y++));
41 -+ mc_wdrawelm(w, f, _getline(w, y++));
42 ++ mc_wdrawelm(w, f, minic_getline(w, y++));
43 if (r)
44 mc_wredraw(w, 1);
45 w->direct = 1;
46 @@ -23,7 +23,7 @@
47 w->direct = 0;
48 for (f = 0; f < w->ys; f++) {
49 - tmp_e = getline(w, y++);
50 -+ tmp_e = _getline(w, y++);
51 ++ tmp_e = minic_getline(w, y++);
52
53 /* First we "accumulate" the line into a variable */
54 mc_wdrawelm_var(w, tmp_e, tmp_line);
55 @@ -32,7 +32,7 @@
56 for (next_line = hit_line; next_line <= all_lines; next_line++) {
57 /* we do 'something' here... :-) */
58 - tmp_e = getline(w_hist, next_line);
59 -+ tmp_e = _getline(w_hist, next_line);
60 ++ tmp_e = minic_getline(w_hist, next_line);
61
62 /*
63 * First we "accumulate" the line into a variable.
64 @@ -41,10 +41,10 @@
65 {
66 if (y+citey >= start && y+citey <= end)
67 - mc_wdrawelm_inverse(w, y, getline(w, y+citey));
68 -+ mc_wdrawelm_inverse(w, y, _getline(w, y+citey));
69 ++ mc_wdrawelm_inverse(w, y, minic_getline(w, y+citey));
70 else
71 - mc_wdrawelm(w, y, getline(w, y+citey));
72 -+ mc_wdrawelm(w, y, _getline(w, y+citey));
73 ++ mc_wdrawelm(w, y, minic_getline(w, y+citey));
74 }
75
76 static void drawcite_whole(WIN *w, int y, int start, int end)
77 @@ -53,7 +53,7 @@
78 vt_send('>');
79 vt_send(' ');
80 - tmp_e = getline(w, y);
81 -+ tmp_e = _getline(w, y);
82 ++ tmp_e = minic_getline(w, y);
83 mc_wdrawelm_var(w, tmp_e, tmp_line);
84 tmp_line[w->xs] = 0;
85 for (x = w->xs-1; x >= 0; x--) {
86 @@ -62,7 +62,7 @@
87 inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
88 } else {
89 - tmp_e = getline(b_us, y);
90 -+ tmp_e = _getline(b_us, y);
91 ++ tmp_e = minic_getline(b_us, y);
92 if (wcslen(look_for) > 1) {
93 /* quick scan for pattern match */
94 mc_wdrawelm_var(b_us, tmp_e, tmp_line);
95 @@ -71,10 +71,10 @@
96
97 if (inverse)
98 - mc_wdrawelm_inverse(b_us, 0, getline(b_us, y));
99 -+ mc_wdrawelm_inverse(b_us, 0, _getline(b_us, y));
100 ++ mc_wdrawelm_inverse(b_us, 0, minic_getline(b_us, y));
101 else
102 - mc_wdrawelm(b_us, 0, getline(b_us, y));
103 -+ mc_wdrawelm(b_us, 0, _getline(b_us, y));
104 ++ mc_wdrawelm(b_us, 0, minic_getline(b_us, y));
105 if (citemode)
106 mc_wlocate(b_us, 0, cite_y);
107 mc_wflush();
108 @@ -83,7 +83,7 @@
109 inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
110 } else {
111 - tmp_e = getline(b_us, y + b_us->ys - 1);
112 -+ tmp_e = _getline(b_us, y + b_us->ys - 1);
113 ++ tmp_e = minic_getline(b_us, y + b_us->ys - 1);
114 if (wcslen(look_for) > 1) {
115 /* quick scan for pattern match */
116 mc_wdrawelm_var(b_us, tmp_e, tmp_line);
117 @@ -92,11 +92,11 @@
118 if (inverse)
119 mc_wdrawelm_inverse(b_us, b_us->ys - 1,
120 - getline(b_us, y + b_us->ys - 1));
121 -+ _getline(b_us, y + b_us->ys - 1));
122 ++ minic_getline(b_us, y + b_us->ys - 1));
123 else
124 mc_wdrawelm(b_us, b_us->ys - 1,
125 - getline(b_us, y + b_us->ys - 1));
126 -+ _getline(b_us, y + b_us->ys - 1));
127 ++ minic_getline(b_us, y + b_us->ys - 1));
128 if (citemode)
129 mc_wlocate(b_us, 0, cite_y);
130 mc_wflush();
131 @@ -105,7 +105,7 @@
132 mc_wprintf(b_st, hline);
133 mc_wredraw(b_st, 1);
134 - mc_wdrawelm_inverse(b_us, cite_y, getline(b_us, cite_ystart));
135 -+ mc_wdrawelm_inverse(b_us, cite_y, _getline(b_us, cite_ystart));
136 ++ mc_wdrawelm_inverse(b_us, cite_y, minic_getline(b_us, cite_ystart));
137 mc_wlocate(b_us, 0, cite_y);
138 break;
139 - case K_ESC:
140 + case K_ESC:
141 \ No newline at end of file