1 |
vapier 13/09/29 06:44:39 |
2 |
|
3 |
Modified: qdepends.c |
4 |
Log: |
5 |
qdepends: constify args |
6 |
|
7 |
Revision Changes Path |
8 |
1.59 portage-utils/qdepends.c |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qdepends.c?rev=1.59&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qdepends.c?rev=1.59&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qdepends.c?r1=1.58&r2=1.59 |
13 |
|
14 |
Index: qdepends.c |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qdepends.c,v |
17 |
retrieving revision 1.58 |
18 |
retrieving revision 1.59 |
19 |
diff -u -r1.58 -r1.59 |
20 |
--- qdepends.c 29 Sep 2013 05:09:29 -0000 1.58 |
21 |
+++ qdepends.c 29 Sep 2013 06:44:39 -0000 1.59 |
22 |
@@ -1,7 +1,7 @@ |
23 |
/* |
24 |
* Copyright 2005-2010 Gentoo Foundation |
25 |
* Distributed under the terms of the GNU General Public License v2 |
26 |
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qdepends.c,v 1.58 2013/09/29 05:09:29 vapier Exp $ |
27 |
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qdepends.c,v 1.59 2013/09/29 06:44:39 vapier Exp $ |
28 |
* |
29 |
* Copyright 2005-2010 Ned Ludd - <solar@g.o> |
30 |
* Copyright 2005-2010 Mike Frysinger - <vapier@g.o> |
31 |
@@ -30,7 +30,7 @@ |
32 |
"Show all DEPEND info", |
33 |
COMMON_OPTS_HELP |
34 |
}; |
35 |
-static const char qdepends_rcsid[] = "$Id: qdepends.c,v 1.58 2013/09/29 05:09:29 vapier Exp $"; |
36 |
+static const char qdepends_rcsid[] = "$Id: qdepends.c,v 1.59 2013/09/29 06:44:39 vapier Exp $"; |
37 |
#define qdepends_usage(ret) usage(ret, QDEPENDS_FLAGS, qdepends_long_opts, qdepends_opts_help, lookup_applet_idx("qdepends")) |
38 |
|
39 |
static char qdep_name_only = 0; |
40 |
@@ -43,9 +43,7 @@ |
41 |
DEP_OR = 3, |
42 |
DEP_GROUP = 4 |
43 |
} dep_type; |
44 |
-#ifdef EBUG |
45 |
static const char * const _dep_names[] = { "NULL", "NORM", "USE", "OR", "GROUP" }; |
46 |
-#endif |
47 |
|
48 |
struct _dep_node { |
49 |
dep_type type; |
50 |
@@ -60,21 +58,17 @@ |
51 |
|
52 |
/* prototypes */ |
53 |
#define dep_dump_tree(r) _dep_dump_tree(r,0) |
54 |
-void _dep_dump_tree(dep_node *root, int space); |
55 |
-dep_node *dep_grow_tree(char *depend); |
56 |
+_q_static void _dep_dump_tree(const dep_node *root, int space); |
57 |
void dep_burn_tree(dep_node *root); |
58 |
-void dep_prune_use(dep_node *root, char *use); |
59 |
-char *dep_flatten_tree(dep_node *root); |
60 |
-dep_node *_dep_grow_node(dep_type type, char *info, size_t info_len); |
61 |
-void _dep_attach(dep_node *root, dep_node *attach_me, int type); |
62 |
-void _dep_flatten_tree(dep_node *root, char *buf, size_t *pos); |
63 |
-void _dep_burn_node(dep_node *node); |
64 |
+char *dep_flatten_tree(const dep_node *root); |
65 |
+_q_static void _dep_attach(dep_node *root, dep_node *attach_me, int type); |
66 |
+_q_static void _dep_flatten_tree(const dep_node *root, char *buf, size_t *pos); |
67 |
+_q_static void _dep_burn_node(dep_node *node); |
68 |
int qdepends_main_vdb(const char *depend_file, int argc, char **argv); |
69 |
int qdepends_vdb_deep(const char *depend_file, const char *query); |
70 |
|
71 |
#ifdef EBUG |
72 |
-void print_word(char *ptr, int num); |
73 |
-void print_word(char *ptr, int num) |
74 |
+_q_static void print_word(const char *ptr, size_t num) |
75 |
{ |
76 |
while (num--) |
77 |
printf("%c", *ptr++); |
78 |
@@ -82,7 +76,8 @@ |
79 |
} |
80 |
#endif |
81 |
|
82 |
-dep_node *_dep_grow_node(dep_type type, char *info, size_t info_len) |
83 |
+_q_static dep_node * |
84 |
+_dep_grow_node(dep_type type, const char *info, size_t info_len) |
85 |
{ |
86 |
dep_node *ret; |
87 |
size_t len; |
88 |
@@ -139,10 +134,10 @@ |
89 |
} |
90 |
} |
91 |
|
92 |
-dep_node *dep_grow_tree(char *depend) |
93 |
+_q_static dep_node *dep_grow_tree(const char *depend) |
94 |
{ |
95 |
signed long paren_balanced; |
96 |
- char *word, *ptr, *p; |
97 |
+ const char *ptr, *word; |
98 |
int curr_attach; |
99 |
dep_node *ret, *curr_node, *new_node; |
100 |
dep_type prev_type; |
101 |
@@ -153,9 +148,6 @@ |
102 |
curr_attach = _DEP_NEIGH; |
103 |
word = NULL; |
104 |
|
105 |
- p = strrchr(depend, '\n'); |
106 |
- if (p != NULL) *p = 0; |
107 |
- |
108 |
#define _maybe_consume_word(t) \ |
109 |
do { \ |
110 |
if (!word) break; \ |
111 |
@@ -259,9 +251,12 @@ |
112 |
return NULL; |
113 |
} |
114 |
|
115 |
-#ifdef EBUG |
116 |
-void _dep_dump_tree(dep_node *root, int space) |
117 |
+_q_static void _dep_dump_tree(const dep_node *root, int space) |
118 |
{ |
119 |
+#ifndef EBUG |
120 |
+ return; |
121 |
+#endif |
122 |
+ |
123 |
int spaceit = space; |
124 |
assert(root); |
125 |
if (root->type == DEP_NULL) goto this_node_sucks; |
126 |
@@ -276,9 +271,6 @@ |
127 |
this_node_sucks: |
128 |
if (root->neighbor) _dep_dump_tree(root->neighbor, space); |
129 |
} |
130 |
-#else |
131 |
-void _dep_dump_tree(_q_unused_ dep_node *root, _q_unused_ int space) {;} |
132 |
-#endif |
133 |
|
134 |
void dep_burn_tree(dep_node *root) |
135 |
{ |
136 |
@@ -288,7 +280,7 @@ |
137 |
_dep_burn_node(root); |
138 |
} |
139 |
|
140 |
-void dep_prune_use(dep_node *root, char *use) |
141 |
+_q_static void dep_prune_use(dep_node *root, const char *use) |
142 |
{ |
143 |
if (root->neighbor) dep_prune_use(root->neighbor, use); |
144 |
if (root->type == DEP_USE) { |
145 |
@@ -305,7 +297,7 @@ |
146 |
if (root->children) dep_prune_use(root->children, use); |
147 |
} |
148 |
|
149 |
-void _dep_flatten_tree(dep_node *root, char *buf, size_t *pos) |
150 |
+void _dep_flatten_tree(const dep_node *root, char *buf, size_t *pos) |
151 |
{ |
152 |
if (root->type == DEP_NULL) goto this_node_sucks; |
153 |
if (root->type == DEP_NORM) { |
154 |
@@ -327,7 +319,7 @@ |
155 |
if (root->neighbor) _dep_flatten_tree(root->neighbor, buf, pos); |
156 |
} |
157 |
|
158 |
-char *dep_flatten_tree(dep_node *root) |
159 |
+char *dep_flatten_tree(const dep_node *root) |
160 |
{ |
161 |
static char flat[8192]; |
162 |
size_t pos = 0; |