Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rm_tree is not actually a thing

This commit is contained in:
Enno Rehling 2017-02-23 08:07:47 +01:00
parent be42137833
commit 9cbd5b88e6
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/kernel/resources.c
View File

@ -185,20 +185,10 @@ struct rawmaterial *rm_get(region * r, const struct resource_type *rtype)
struct rawmaterial_type *rmt_find(const char *str) struct rawmaterial_type *rmt_find(const char *str)
{ {
const char * replace[] = { "rm_tree", "log", NULL };
resource_type *rtype = rt_find(str); resource_type *rtype = rt_find(str);
if (!rtype && strncmp(str, "rm_", 3) == 0) { if (!rtype && strncmp(str, "rm_", 3) == 0) {
int i;
for (i = 0; replace[i]; i+=2) {
if (strcmp(replace[i], str) == 0) {
rtype = rt_find(replace[i+1]);
break;
}
}
if (!rtype) {
rtype = rt_find(str+3); rtype = rt_find(str+3);
} }
}
assert(rtype); assert(rtype);
return rtype ? rtype->raw : NULL; return rtype ? rtype->raw : NULL;
} }