1 |
commit: 1d4228adcfe4489bd330076e2b1004905d97d6cc |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 17 04:40:23 2015 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 17 04:40:23 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=1d4228ad |
7 |
|
8 |
clean up old debug statements |
9 |
|
10 |
Much of this debug output has outlived its usefulness now that the code |
11 |
has stabilized. Clean it all up to make the debug builds way less noisy |
12 |
and keep from breaking the tests. |
13 |
|
14 |
main.c | 5 +++-- |
15 |
q.c | 3 --- |
16 |
qatom.c | 3 --- |
17 |
qcache.c | 3 --- |
18 |
qcheck.c | 3 --- |
19 |
qdepends.c | 13 ------------- |
20 |
qfile.c | 3 --- |
21 |
qglsa.c | 3 --- |
22 |
qgrep.c | 3 --- |
23 |
qlist.c | 3 --- |
24 |
qlop.c | 5 ----- |
25 |
qpkg.c | 2 -- |
26 |
qsearch.c | 3 --- |
27 |
qsize.c | 3 --- |
28 |
qtbz2.c | 3 --- |
29 |
quse.c | 3 --- |
30 |
qxpak.c | 3 --- |
31 |
template.c | 3 --- |
32 |
18 files changed, 3 insertions(+), 64 deletions(-) |
33 |
|
34 |
diff --git a/main.c b/main.c |
35 |
index be25d08..c571ef7 100644 |
36 |
--- a/main.c |
37 |
+++ b/main.c |
38 |
@@ -592,7 +592,8 @@ _q_static void read_portage_env_file(const char *configroot, const char *file, e |
39 |
FILE *fp; |
40 |
char *buf, *s, *p; |
41 |
|
42 |
- IF_DEBUG(fprintf(stderr, "profile %s\n", file)); |
43 |
+ if (getenv("DEBUG")) |
44 |
+ fprintf(stderr, "profile %s\n", file); |
45 |
|
46 |
configroot_len = strlen(configroot); |
47 |
file_len = strlen(file); |
48 |
@@ -885,7 +886,7 @@ void initialize_portage_env(void) |
49 |
} |
50 |
} |
51 |
|
52 |
- if (getenv("DEBUG") IF_DEBUG(|| 1)) { |
53 |
+ if (getenv("DEBUG")) { |
54 |
for (i = 0; vars_to_read[i].name; ++i) { |
55 |
var = &vars_to_read[i]; |
56 |
fprintf(stderr, "%s = ", var->name); |
57 |
|
58 |
diff --git a/q.c b/q.c |
59 |
index 443ce4b..53b359f 100644 |
60 |
--- a/q.c |
61 |
+++ b/q.c |
62 |
@@ -32,7 +32,6 @@ static APPLET lookup_applet(const char *applet) |
63 |
|
64 |
for (i = 0; applets[i].name; ++i) { |
65 |
if (strcmp(applets[i].name, applet) == 0) { |
66 |
- DBG("found applet %s at %p", applets[i].name, applets[i].func); |
67 |
argv0 = applets[i].name; |
68 |
if (i && applets[i].desc != NULL) ++argv0; /* chop the leading 'q' */ |
69 |
return applets[i].func; |
70 |
@@ -40,10 +39,8 @@ static APPLET lookup_applet(const char *applet) |
71 |
} |
72 |
|
73 |
/* No applet found? Search by shortname then... */ |
74 |
- DBG("Looking up applet (%s) by short name", applet); |
75 |
for (i = 1; applets[i].desc != NULL; ++i) { |
76 |
if (strcmp(applets[i].name + 1, applet) == 0) { |
77 |
- DBG("found applet by short name %s", applets[i].name); |
78 |
argv0 = applets[i].name + 1; |
79 |
return applets[i].func; |
80 |
} |
81 |
|
82 |
diff --git a/qatom.c b/qatom.c |
83 |
index 16445dd..acf9fd6 100644 |
84 |
--- a/qatom.c |
85 |
+++ b/qatom.c |
86 |
@@ -109,9 +109,6 @@ int qatom_main(int argc, char **argv) |
87 |
depend_atom *atom; |
88 |
int i; |
89 |
|
90 |
- DBG("argc=%d argv[0]=%s argv[1]=%s", |
91 |
- argc, argv[0], argc > 1 ? argv[1] : "NULL?"); |
92 |
- |
93 |
while ((i = GETOPT_LONG(QATOM, qatom, "")) != -1) { |
94 |
switch (i) { |
95 |
case 'F': format = optarg; break; |
96 |
|
97 |
diff --git a/qcache.c b/qcache.c |
98 |
index d4b7884..759e50a 100644 |
99 |
--- a/qcache.c |
100 |
+++ b/qcache.c |
101 |
@@ -912,9 +912,6 @@ int qcache_main(int argc, char **argv) |
102 |
{ |
103 |
int i, action = 0; |
104 |
|
105 |
- DBG("argc=%d argv[0]=%s argv[1]=%s", |
106 |
- argc, argv[0], argc > 1 ? argv[1] : "NULL?"); |
107 |
- |
108 |
while ((i = GETOPT_LONG(QCACHE, qcache, "")) != -1) { |
109 |
switch (i) { |
110 |
case 'p': qcache_matchpkg = optarg; break; |
111 |
|
112 |
diff --git a/qcheck.c b/qcheck.c |
113 |
index 6ad5f85..cdbc507 100644 |
114 |
--- a/qcheck.c |
115 |
+++ b/qcheck.c |
116 |
@@ -373,9 +373,6 @@ int qcheck_main(int argc, char **argv) |
117 |
.exact = false, |
118 |
}; |
119 |
|
120 |
- DBG("argc=%d argv[0]=%s argv[1]=%s", |
121 |
- argc, argv[0], argc > 1 ? argv[1] : "NULL?"); |
122 |
- |
123 |
while ((i = GETOPT_LONG(QCHECK, qcheck, "")) != -1) { |
124 |
switch (i) { |
125 |
COMMON_GETOPTS_CASES(qcheck) |
126 |
|
127 |
diff --git a/qdepends.c b/qdepends.c |
128 |
index 5ded84b..197c376 100644 |
129 |
--- a/qdepends.c |
130 |
+++ b/qdepends.c |
131 |
@@ -411,17 +411,12 @@ _q_static int qdepends_main_vdb_cb(q_vdb_pkg_ctx *pkg_ctx, void *priv) |
132 |
if (i == state->argc) |
133 |
return 0; |
134 |
|
135 |
- IF_DEBUG(warn("matched %s/%s", catname, pkgname)); |
136 |
- |
137 |
if (!q_vdb_pkg_eat(pkg_ctx, state->depend_file, &depend, &depend_len)) |
138 |
return 0; |
139 |
|
140 |
- IF_DEBUG(warn("growing tree...")); |
141 |
dep_tree = dep_grow_tree(depend); |
142 |
if (dep_tree == NULL) |
143 |
return 0; |
144 |
- IF_DEBUG(puts(depend)); |
145 |
- IF_DEBUG(dep_dump_tree(dep_tree)); |
146 |
|
147 |
if (qdep_name_only) { |
148 |
depend_atom *atom = NULL; |
149 |
@@ -474,17 +469,12 @@ _q_static int qdepends_vdb_deep_cb(q_vdb_pkg_ctx *pkg_ctx, void *priv) |
150 |
static size_t depend_len, use_len; |
151 |
dep_node *dep_tree; |
152 |
|
153 |
- IF_DEBUG(warn("matched %s/%s for %s", catname, pkgname, state->depend_file)); |
154 |
- |
155 |
if (!q_vdb_pkg_eat(pkg_ctx, state->depend_file, &depend, &depend_len)) |
156 |
return 0; |
157 |
|
158 |
- IF_DEBUG(warn("growing tree...")); |
159 |
dep_tree = dep_grow_tree(depend); |
160 |
if (dep_tree == NULL) |
161 |
return 0; |
162 |
- IF_DEBUG(puts(depend)); |
163 |
- IF_DEBUG(dep_dump_tree(dep_tree)); |
164 |
|
165 |
if (q_vdb_pkg_eat(pkg_ctx, "USE", &use, &use_len)) |
166 |
use[0] = '\0'; |
167 |
@@ -539,9 +529,6 @@ int qdepends_main(int argc, char **argv) |
168 |
|
169 |
depend_file = depend_files[0]; |
170 |
|
171 |
- DBG("argc=%d argv[0]=%s argv[1]=%s", |
172 |
- argc, argv[0], argc > 1 ? argv[1] : "NULL?"); |
173 |
- |
174 |
while ((i = GETOPT_LONG(QDEPENDS, qdepends, "")) != -1) { |
175 |
switch (i) { |
176 |
COMMON_GETOPTS_CASES(qdepends) |
177 |
|
178 |
diff --git a/qfile.c b/qfile.c |
179 |
index 6d36e96..5082093 100644 |
180 |
--- a/qfile.c |
181 |
+++ b/qfile.c |
182 |
@@ -407,9 +407,6 @@ int qfile_main(int argc, char **argv) |
183 |
FILE *args_file = NULL; |
184 |
int max_args = QFILE_DEFAULT_MAX_ARGS; |
185 |
|
186 |
- DBG("argc=%d argv[0]=%s argv[1]=%s", |
187 |
- argc, argv[0], argc > 1 ? argv[1] : "NULL?"); |
188 |
- |
189 |
while ((i = GETOPT_LONG(QFILE, qfile, "")) != -1) { |
190 |
switch (i) { |
191 |
COMMON_GETOPTS_CASES(qfile) |
192 |
|
193 |
diff --git a/qglsa.c b/qglsa.c |
194 |
index 7bc350f..885ce1e 100644 |
195 |
--- a/qglsa.c |
196 |
+++ b/qglsa.c |
197 |
@@ -285,9 +285,6 @@ int qglsa_main(int argc, char **argv) |
198 |
qglsa_action action = GLSA_FUNKYTOWN; |
199 |
bool all_glsas = false; |
200 |
|
201 |
- DBG("argc=%d argv[0]=%s argv[1]=%s", |
202 |
- argc, argv[0], argc > 1 ? argv[1] : "NULL?"); |
203 |
- |
204 |
while ((i = GETOPT_LONG(QGLSA, qglsa, "")) != -1) { |
205 |
#define set_action(a) { if (action == 0) action = a; else err("cannot specify more than one action at a time"); } |
206 |
switch (i) { |
207 |
|
208 |
diff --git a/qgrep.c b/qgrep.c |
209 |
index e7c2c10..7551ebb 100644 |
210 |
--- a/qgrep.c |
211 |
+++ b/qgrep.c |
212 |
@@ -261,9 +261,6 @@ int qgrep_main(int argc, char **argv) |
213 |
|
214 |
QGREP_STR_FUNC strfunc = strstr; |
215 |
|
216 |
- DBG("argc=%d argv[0]=%s argv[1]=%s", |
217 |
- argc, argv[0], argc > 1 ? argv[1] : "NULL?"); |
218 |
- |
219 |
do_count = do_regex = do_eclass = do_installed = do_list = 0; |
220 |
show_filename = skip_comments = invert_list = show_name = 0; |
221 |
|
222 |
|
223 |
diff --git a/qlist.c b/qlist.c |
224 |
index d17ba5e..cd52bf0 100644 |
225 |
--- a/qlist.c |
226 |
+++ b/qlist.c |
227 |
@@ -379,9 +379,6 @@ int qlist_main(int argc, char **argv) |
228 |
}; |
229 |
int i, ret; |
230 |
|
231 |
- DBG("argc=%d argv[0]=%s argv[1]=%s", |
232 |
- argc, argv[0], argc > 1 ? argv[1] : "NULL?"); |
233 |
- |
234 |
while ((i = GETOPT_LONG(QLIST, qlist, "")) != -1) { |
235 |
switch (i) { |
236 |
COMMON_GETOPTS_CASES(qlist) |
237 |
|
238 |
diff --git a/qlop.c b/qlop.c |
239 |
index f2f97c6..546c353 100644 |
240 |
--- a/qlop.c |
241 |
+++ b/qlop.c |
242 |
@@ -107,8 +107,6 @@ show_merge_times(char *package, const char *logfile, int average, char human_rea |
243 |
pkg = package; |
244 |
} |
245 |
|
246 |
- DBG("Searching for %s in %s\n", pkg, logfile); |
247 |
- |
248 |
if ((fp = fopen(logfile, "r")) == NULL) { |
249 |
warnp("Could not open logfile '%s'", logfile); |
250 |
return 1; |
251 |
@@ -645,9 +643,6 @@ int qlop_main(int argc, char **argv) |
252 |
char do_time, do_list, do_unlist, do_sync, do_current, do_human_readable = 0; |
253 |
char *logfile = NULL; |
254 |
|
255 |
- DBG("argc=%d argv[0]=%s argv[1]=%s", |
256 |
- argc, argv[0], argc > 1 ? argv[1] : "NULL?"); |
257 |
- |
258 |
do_time = do_list = do_unlist = do_sync = do_current = 0; |
259 |
|
260 |
while ((i = GETOPT_LONG(QLOP, qlop, "")) != -1) { |
261 |
|
262 |
diff --git a/qpkg.c b/qpkg.c |
263 |
index 2c9e774..996efcd 100644 |
264 |
--- a/qpkg.c |
265 |
+++ b/qpkg.c |
266 |
@@ -320,8 +320,6 @@ int qpkg_main(int argc, char **argv) |
267 |
depend_atom *atom; |
268 |
int restrict_chmod = 0; |
269 |
int qclean = 0; |
270 |
- DBG("argc=%d argv[0]=%s argv[1]=%s", |
271 |
- argc, argv[0], argc > 1 ? argv[1] : "NULL?"); |
272 |
|
273 |
while ((i = GETOPT_LONG(QPKG, qpkg, "")) != -1) { |
274 |
switch (i) { |
275 |
|
276 |
diff --git a/qsearch.c b/qsearch.c |
277 |
index b7c992e..2ba2d39 100644 |
278 |
--- a/qsearch.c |
279 |
+++ b/qsearch.c |
280 |
@@ -140,9 +140,6 @@ int qsearch_main(int argc, char **argv) |
281 |
int i; |
282 |
void (*search_func)(int, const char *, const char *, char *last, bool, bool, bool, bool, bool); |
283 |
|
284 |
- DBG("argc=%d argv[0]=%s argv[1]=%s", |
285 |
- argc, argv[0], argc > 1 ? argv[1] : "NULL?"); |
286 |
- |
287 |
while ((i = GETOPT_LONG(QSEARCH, qsearch, "")) != -1) { |
288 |
switch (i) { |
289 |
COMMON_GETOPTS_CASES(qsearch) |
290 |
|
291 |
diff --git a/qsize.c b/qsize.c |
292 |
index 486edcf..7a2503a 100644 |
293 |
--- a/qsize.c |
294 |
+++ b/qsize.c |
295 |
@@ -52,9 +52,6 @@ int qsize_main(int argc, char **argv) |
296 |
char filename[_Q_PATH_MAX], *filename_root; |
297 |
queue *ignore_regexp = NULL; |
298 |
|
299 |
- DBG("argc=%d argv[0]=%s argv[1]=%s", |
300 |
- argc, argv[0], argc > 1 ? argv[1] : "NULL?"); |
301 |
- |
302 |
while ((i = GETOPT_LONG(QSIZE, qsize, "")) != -1) { |
303 |
switch (i) { |
304 |
COMMON_GETOPTS_CASES(qsize) |
305 |
|
306 |
diff --git a/qtbz2.c b/qtbz2.c |
307 |
index 9208097..da2e9ab 100644 |
308 |
--- a/qtbz2.c |
309 |
+++ b/qtbz2.c |
310 |
@@ -244,9 +244,6 @@ int qtbz2_main(int argc, char **argv) |
311 |
char *heap_tbz2, *heap_xpak, *heap_tarbz2; |
312 |
char *tbz2, *xpak, *tarbz2; |
313 |
|
314 |
- DBG("argc=%d argv[0]=%s argv[1]=%s", |
315 |
- argc, argv[0], argc > 1 ? argv[1] : "NULL?"); |
316 |
- |
317 |
action = TBZ2_ACT_NONE; |
318 |
dir_fd = AT_FDCWD; |
319 |
|
320 |
|
321 |
diff --git a/quse.c b/quse.c |
322 |
index 2ac6cad..59db37a 100644 |
323 |
--- a/quse.c |
324 |
+++ b/quse.c |
325 |
@@ -242,9 +242,6 @@ int quse_main(int argc, char **argv) |
326 |
size_t n; |
327 |
const char *overlay; |
328 |
|
329 |
- DBG("argc=%d argv[0]=%s argv[1]=%s", |
330 |
- argc, argv[0], argc > 1 ? argv[1] : "NULL?"); |
331 |
- |
332 |
while ((i = GETOPT_LONG(QUSE, quse, "")) != -1) { |
333 |
switch (i) { |
334 |
case 'e': regexp_matching = 0; break; |
335 |
|
336 |
diff --git a/qxpak.c b/qxpak.c |
337 |
index d7cec6f..fb19ef9 100644 |
338 |
--- a/qxpak.c |
339 |
+++ b/qxpak.c |
340 |
@@ -379,9 +379,6 @@ int qxpak_main(int argc, char **argv) |
341 |
char *xpak; |
342 |
char action = XPAK_ACT_NONE; |
343 |
|
344 |
- DBG("argc=%d argv[0]=%s argv[1]=%s", |
345 |
- argc, argv[0], argc > 1 ? argv[1] : "NULL?"); |
346 |
- |
347 |
dir_fd = AT_FDCWD; |
348 |
xpak_stdout = 0; |
349 |
|
350 |
|
351 |
diff --git a/template.c b/template.c |
352 |
index eff93e8..d4b9e98 100644 |
353 |
--- a/template.c |
354 |
+++ b/template.c |
355 |
@@ -21,9 +21,6 @@ int qtemp_main(int argc, char **argv) |
356 |
{ |
357 |
int i; |
358 |
|
359 |
- DBG("argc=%d argv[0]=%s argv[1]=%s", |
360 |
- argc, argv[0], argc > 1 ? argv[1] : "NULL?"); |
361 |
- |
362 |
while ((i = GETOPT_LONG(QTEMP, qtemp, "")) != -1) { |
363 |
switch (i) { |
364 |
COMMON_GETOPTS_CASES(qtemp) |