diff options
Diffstat (limited to 'networking/libiproute/rt_names.c')
-rw-r--r-- | networking/libiproute/rt_names.c | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/networking/libiproute/rt_names.c b/networking/libiproute/rt_names.c index 2699dba3d..8dd16e3d3 100644 --- a/networking/libiproute/rt_names.c +++ b/networking/libiproute/rt_names.c | |||
@@ -90,10 +90,10 @@ static void rtnl_rtprot_initialize(void) | |||
90 | rtnl_tab_initialize("/etc/iproute2/rt_protos", rtnl_rtprot_tab->tab); | 90 | rtnl_tab_initialize("/etc/iproute2/rt_protos", rtnl_rtprot_tab->tab); |
91 | } | 91 | } |
92 | 92 | ||
93 | const char* rtnl_rtprot_n2a(int id, char *buf, int len) | 93 | const char* FAST_FUNC rtnl_rtprot_n2a(int id, char *buf) |
94 | { | 94 | { |
95 | if (id < 0 || id >= 256) { | 95 | if (id < 0 || id >= 256) { |
96 | snprintf(buf, len, "%d", id); | 96 | sprintf(buf, "%d", id); |
97 | return buf; | 97 | return buf; |
98 | } | 98 | } |
99 | 99 | ||
@@ -101,11 +101,12 @@ const char* rtnl_rtprot_n2a(int id, char *buf, int len) | |||
101 | 101 | ||
102 | if (rtnl_rtprot_tab->tab[id]) | 102 | if (rtnl_rtprot_tab->tab[id]) |
103 | return rtnl_rtprot_tab->tab[id]; | 103 | return rtnl_rtprot_tab->tab[id]; |
104 | snprintf(buf, len, "%d", id); | 104 | /* buf is SPRINT_BSIZE big */ |
105 | sprintf(buf, "%d", id); | ||
105 | return buf; | 106 | return buf; |
106 | } | 107 | } |
107 | 108 | ||
108 | int rtnl_rtprot_a2n(uint32_t *id, char *arg) | 109 | int FAST_FUNC rtnl_rtprot_a2n(uint32_t *id, char *arg) |
109 | { | 110 | { |
110 | rtnl_rtprot_initialize(); | 111 | rtnl_rtprot_initialize(); |
111 | return rtnl_a2n(rtnl_rtprot_tab, id, arg, 0); | 112 | return rtnl_a2n(rtnl_rtprot_tab, id, arg, 0); |
@@ -127,10 +128,10 @@ static void rtnl_rtscope_initialize(void) | |||
127 | rtnl_tab_initialize("/etc/iproute2/rt_scopes", rtnl_rtscope_tab->tab); | 128 | rtnl_tab_initialize("/etc/iproute2/rt_scopes", rtnl_rtscope_tab->tab); |
128 | } | 129 | } |
129 | 130 | ||
130 | const char* rtnl_rtscope_n2a(int id, char *buf, int len) | 131 | const char* FAST_FUNC rtnl_rtscope_n2a(int id, char *buf) |
131 | { | 132 | { |
132 | if (id < 0 || id >= 256) { | 133 | if (id < 0 || id >= 256) { |
133 | snprintf(buf, len, "%d", id); | 134 | sprintf(buf, "%d", id); |
134 | return buf; | 135 | return buf; |
135 | } | 136 | } |
136 | 137 | ||
@@ -138,11 +139,12 @@ const char* rtnl_rtscope_n2a(int id, char *buf, int len) | |||
138 | 139 | ||
139 | if (rtnl_rtscope_tab->tab[id]) | 140 | if (rtnl_rtscope_tab->tab[id]) |
140 | return rtnl_rtscope_tab->tab[id]; | 141 | return rtnl_rtscope_tab->tab[id]; |
141 | snprintf(buf, len, "%d", id); | 142 | /* buf is SPRINT_BSIZE big */ |
143 | sprintf(buf, "%d", id); | ||
142 | return buf; | 144 | return buf; |
143 | } | 145 | } |
144 | 146 | ||
145 | int rtnl_rtscope_a2n(uint32_t *id, char *arg) | 147 | int FAST_FUNC rtnl_rtscope_a2n(uint32_t *id, char *arg) |
146 | { | 148 | { |
147 | rtnl_rtscope_initialize(); | 149 | rtnl_rtscope_initialize(); |
148 | return rtnl_a2n(rtnl_rtscope_tab, id, arg, 0); | 150 | return rtnl_a2n(rtnl_rtscope_tab, id, arg, 0); |
@@ -159,17 +161,17 @@ static void rtnl_rtrealm_initialize(void) | |||
159 | rtnl_tab_initialize("/etc/iproute2/rt_realms", rtnl_rtrealm_tab->tab); | 161 | rtnl_tab_initialize("/etc/iproute2/rt_realms", rtnl_rtrealm_tab->tab); |
160 | } | 162 | } |
161 | 163 | ||
162 | int rtnl_rtrealm_a2n(uint32_t *id, char *arg) | 164 | int FAST_FUNC rtnl_rtrealm_a2n(uint32_t *id, char *arg) |
163 | { | 165 | { |
164 | rtnl_rtrealm_initialize(); | 166 | rtnl_rtrealm_initialize(); |
165 | return rtnl_a2n(rtnl_rtrealm_tab, id, arg, 0); | 167 | return rtnl_a2n(rtnl_rtrealm_tab, id, arg, 0); |
166 | } | 168 | } |
167 | 169 | ||
168 | #if ENABLE_FEATURE_IP_RULE | 170 | #if ENABLE_FEATURE_IP_RULE |
169 | const char* rtnl_rtrealm_n2a(int id, char *buf, int len) | 171 | const char* FAST_FUNC rtnl_rtrealm_n2a(int id, char *buf) |
170 | { | 172 | { |
171 | if (id < 0 || id >= 256) { | 173 | if (id < 0 || id >= 256) { |
172 | snprintf(buf, len, "%d", id); | 174 | sprintf(buf, "%d", id); |
173 | return buf; | 175 | return buf; |
174 | } | 176 | } |
175 | 177 | ||
@@ -177,7 +179,8 @@ const char* rtnl_rtrealm_n2a(int id, char *buf, int len) | |||
177 | 179 | ||
178 | if (rtnl_rtrealm_tab->tab[id]) | 180 | if (rtnl_rtrealm_tab->tab[id]) |
179 | return rtnl_rtrealm_tab->tab[id]; | 181 | return rtnl_rtrealm_tab->tab[id]; |
180 | snprintf(buf, len, "%d", id); | 182 | /* buf is SPRINT_BSIZE big */ |
183 | sprintf(buf, "%d", id); | ||
181 | return buf; | 184 | return buf; |
182 | } | 185 | } |
183 | #endif | 186 | #endif |
@@ -193,10 +196,10 @@ static void rtnl_rtdsfield_initialize(void) | |||
193 | rtnl_tab_initialize("/etc/iproute2/rt_dsfield", rtnl_rtdsfield_tab->tab); | 196 | rtnl_tab_initialize("/etc/iproute2/rt_dsfield", rtnl_rtdsfield_tab->tab); |
194 | } | 197 | } |
195 | 198 | ||
196 | const char * rtnl_dsfield_n2a(int id, char *buf, int len) | 199 | const char* FAST_FUNC rtnl_dsfield_n2a(int id, char *buf) |
197 | { | 200 | { |
198 | if (id < 0 || id >= 256) { | 201 | if (id < 0 || id >= 256) { |
199 | snprintf(buf, len, "%d", id); | 202 | sprintf(buf, "%d", id); |
200 | return buf; | 203 | return buf; |
201 | } | 204 | } |
202 | 205 | ||
@@ -204,11 +207,12 @@ const char * rtnl_dsfield_n2a(int id, char *buf, int len) | |||
204 | 207 | ||
205 | if (rtnl_rtdsfield_tab->tab[id]) | 208 | if (rtnl_rtdsfield_tab->tab[id]) |
206 | return rtnl_rtdsfield_tab->tab[id]; | 209 | return rtnl_rtdsfield_tab->tab[id]; |
207 | snprintf(buf, len, "0x%02x", id); | 210 | /* buf is SPRINT_BSIZE big */ |
211 | sprintf(buf, "0x%02x", id); | ||
208 | return buf; | 212 | return buf; |
209 | } | 213 | } |
210 | 214 | ||
211 | int rtnl_dsfield_a2n(uint32_t *id, char *arg) | 215 | int FAST_FUNC rtnl_dsfield_a2n(uint32_t *id, char *arg) |
212 | { | 216 | { |
213 | rtnl_rtdsfield_initialize(); | 217 | rtnl_rtdsfield_initialize(); |
214 | return rtnl_a2n(rtnl_rtdsfield_tab, id, arg, 16); | 218 | return rtnl_a2n(rtnl_rtdsfield_tab, id, arg, 16); |
@@ -229,10 +233,10 @@ static void rtnl_rttable_initialize(void) | |||
229 | rtnl_tab_initialize("/etc/iproute2/rt_tables", rtnl_rttable_tab->tab); | 233 | rtnl_tab_initialize("/etc/iproute2/rt_tables", rtnl_rttable_tab->tab); |
230 | } | 234 | } |
231 | 235 | ||
232 | const char *rtnl_rttable_n2a(int id, char *buf, int len) | 236 | const char* FAST_FUNC rtnl_rttable_n2a(int id, char *buf) |
233 | { | 237 | { |
234 | if (id < 0 || id >= 256) { | 238 | if (id < 0 || id >= 256) { |
235 | snprintf(buf, len, "%d", id); | 239 | sprintf(buf, "%d", id); |
236 | return buf; | 240 | return buf; |
237 | } | 241 | } |
238 | 242 | ||
@@ -240,11 +244,12 @@ const char *rtnl_rttable_n2a(int id, char *buf, int len) | |||
240 | 244 | ||
241 | if (rtnl_rttable_tab->tab[id]) | 245 | if (rtnl_rttable_tab->tab[id]) |
242 | return rtnl_rttable_tab->tab[id]; | 246 | return rtnl_rttable_tab->tab[id]; |
243 | snprintf(buf, len, "%d", id); | 247 | /* buf is SPRINT_BSIZE big */ |
248 | sprintf(buf, "%d", id); | ||
244 | return buf; | 249 | return buf; |
245 | } | 250 | } |
246 | 251 | ||
247 | int rtnl_rttable_a2n(uint32_t *id, char *arg) | 252 | int FAST_FUNC rtnl_rttable_a2n(uint32_t *id, char *arg) |
248 | { | 253 | { |
249 | rtnl_rttable_initialize(); | 254 | rtnl_rttable_initialize(); |
250 | return rtnl_a2n(rtnl_rttable_tab, id, arg, 0); | 255 | return rtnl_a2n(rtnl_rttable_tab, id, arg, 0); |