summaryrefslogtreecommitdiff
path: root/community/mg/cleanup.patch
blob: 5a8e761cbc15e69c4f2bc3782a8ac237a83a5cef (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
Only in mg-20110120.my: autoexec.o
Only in mg-20110120.my: basename.o
Only in mg-20110120.my: basic.o
Only in mg-20110120.my: buffer.o
Only in mg-20110120.my: cinfo.o
diff -wbBur mg-20110120/cmode.c mg-20110120.my/cmode.c
--- mg-20110120/cmode.c	2011-01-20 07:36:13.000000000 +0300
+++ mg-20110120.my/cmode.c	2011-11-21 15:40:11.000000000 +0400
@@ -158,7 +158,7 @@
 cc_indent(int f, int n)
 {
 	int pi, mi;			/* Previous indents */
-	int ci, dci;			/* current indent, don't care */
+	int ci;			/* current indent, don't care */
 	struct line *lp;
 	int ret;
 	
@@ -181,7 +181,7 @@
 	/* Strip leading space on current line */
 	delleadwhite(FFRAND, 1);
 	/* current indent is computed only to current position */
-	dci = getindent(curwp->w_dotp, &ci);
+	getindent(curwp->w_dotp, &ci);
 	
 	if (pi + ci < 0)
 		ret = indent(FFOTHARG, 0);
@@ -217,7 +217,6 @@
 {
 	int lo, co;		/* leading space,  current offset*/
 	int nicol = 0;		/* position count */
-	int ccol = 0;		/* current column */
 	int c = '\0';		/* current char */
 	int newind = 0;		/* new index value */
 	int stringp = FALSE;	/* in string? */
@@ -226,7 +225,6 @@
 	int nparen = 0;		/* paren count */
 	int obrace = 0;		/* open brace count */
 	int cbrace = 0;		/* close brace count */
-	int contp = FALSE;	/* Continue? */
 	int firstnwsp = FALSE;	/* First nonspace encountered? */
 	int colonp = FALSE;	/* Did we see a colon? */
 	int questionp = FALSE;	/* Did we see a question mark? */
@@ -256,13 +254,11 @@
 		nicol = 0;
 
 	newind = 0;
-	ccol = nicol;			/* current column */
 	/* Compute modifiers */
 	for (co = lo; co < llength(lp); co++) {
 		c = lgetc(lp, co);
 		/* We have a non-whitespace char */
 		if (!firstnwsp && !isspace(c)) {
-			contp = TRUE;
 			if (c == '#')
 				cppp = TRUE;
 			firstnwsp = TRUE; 
@@ -285,7 +281,6 @@
 		} else if (c == '{') {
 			obrace++;
 			firstnwsp = FALSE;
-			contp = FALSE;
 		} else if (c == '}') {
 			cbrace++;
 		} else if (c == '?') {
@@ -294,9 +289,6 @@
 			/* ignore (foo ? bar : baz) construct */
 			if (!questionp)
 				colonp = TRUE;
-		} else if (c == ';') {
-			if (nparen > 0)
-				contp = FALSE;
 		} else if (c == '/') {
 			/* first nonwhitespace? -> indent */
 			if (firstnwsp) {
Only in mg-20110120.my: cmode.o
diff -wbBur mg-20110120/config.h mg-20110120.my/config.h
--- mg-20110120/config.h	2011-01-20 07:37:40.000000000 +0300
+++ mg-20110120.my/config.h	2011-11-21 15:39:43.000000000 +0400
@@ -7,4 +7,8 @@
 #ifndef MAXLOGNAME
 #define MAXLOGNAME LOGIN_NAME_MAX
 #endif
-#define HAVE_ARC4RANDOM
+#define HAVE_NOSTRTONUM
+#define HAVE_NOSTRLCPY
+#define HAVE_NOSTRLCAT
+#define HAVE_NOFGETLN
+#define GNU_LS
Only in mg-20110120.my: config.log
Only in mg-20110120.my: dired.o
Only in mg-20110120.my: dirname.o
Only in mg-20110120.my: dir.o
Only in mg-20110120.my: display.o
Only in mg-20110120.my: echo.o
Only in mg-20110120.my: extend.o
Only in mg-20110120.my: fgetln.o
diff -wbBur mg-20110120/fileio.c mg-20110120.my/fileio.c
--- mg-20110120/fileio.c	2008-12-30 19:04:23.000000000 +0300
+++ mg-20110120.my/fileio.c	2011-11-21 15:43:12.000000000 +0400
@@ -121,10 +121,8 @@
 	 * future writes will do the same thing.
 	 */
 	if (bp && bp->b_fi.fi_mode) {
-		int ret;
-
 		fchmod(fd, bp->b_fi.fi_mode & 07777);
-		ret = fchown(fd, bp->b_fi.fi_uid, bp->b_fi.fi_gid);
+		(void)fchown(fd, bp->b_fi.fi_uid, bp->b_fi.fi_gid);
 	}
 	return (FIOSUC);
 }
Only in mg-20110120.my: fileio.o
Only in mg-20110120.my: file.o
Only in mg-20110120.my: funmap.o
Only in mg-20110120.my: grep.o
Only in mg-20110120.my: help.o
Only in mg-20110120.my: kbd.o
Only in mg-20110120.my: keymap.o
Only in mg-20110120.my: line.o
Only in mg-20110120.my: macro.o
Only in mg-20110120.my: main.o
Only in mg-20110120.my: Makefile
Only in mg-20110120.my: match.o
Only in mg-20110120.my: mg
Only in mg-20110120.my: modes.o
Only in mg-20110120.my: paragraph.o
Only in mg-20110120.my: random.o
Only in mg-20110120.my: region.o
Only in mg-20110120.my: re_search.o
Only in mg-20110120.my: search.o
Only in mg-20110120.my: spawn.o
Only in mg-20110120.my: strlcat.o
Only in mg-20110120.my: strlcpy.o
Only in mg-20110120.my: strtonum.o
Only in mg-20110120.my: theo.o
Only in mg-20110120.my: ttyio.o
Only in mg-20110120.my: ttykbd.o
Only in mg-20110120.my: tty.o
diff -wbBur mg-20110120/undo.c mg-20110120.my/undo.c
--- mg-20110120/undo.c	2011-01-03 01:57:57.000000000 +0300
+++ mg-20110120.my/undo.c	2011-11-21 15:41:05.000000000 +0400
@@ -464,14 +464,14 @@
 	struct undo_rec	*ptr, *nptr;
 	int		 done, rval;
 	struct line	*lp;
-	int		 offset, save, dot;
+	int		 offset, save;
 	static int	 nulled = FALSE;
 	int		 lineno;
 
 	if (n < 0)
 		return (FALSE);
 
-	dot = find_dot(curwp->w_dotp, curwp->w_doto);
+	find_dot(curwp->w_dotp, curwp->w_doto);
 
 	ptr = curbp->b_undoptr;
 
Only in mg-20110120.my: undo.o
Only in mg-20110120.my: version.o
Only in mg-20110120.my: window.o
Only in mg-20110120.my: word.o
Only in mg-20110120.my: yank.o