chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mention heap.h in makefile so it is distributed
[disorder]
/
lib
/
trackname.c
diff --git
a/lib/trackname.c
b/lib/trackname.c
index 93c7b3e7c86e8ec5848124821e047b130d95b0de..53824d73df8b593fd8275a2583ca64e32fe60d2d 100644
(file)
--- a/
lib/trackname.c
+++ b/
lib/trackname.c
@@
-33,7
+33,7
@@
#include "filepart.h"
#include "words.h"
#include "filepart.h"
#include "words.h"
-const
char *find_track_root
(const char *track) {
+const
struct collection *find_track_collection
(const char *track) {
int n;
size_t l, tl = strlen(track);
int n;
size_t l, tl = strlen(track);
@@
-44,11
+44,18
@@
const char *find_track_root(const char *track) {
&& track[l] == '/')
break;
}
&& track[l] == '/')
break;
}
- if(n >= config->collection.n) {
- error(0, "found track in no collection '%s'", track);
+ if(n < config->collection.n)
+ return &config->collection.s[n];
+ else
return 0;
return 0;
- }
- return config->collection.s[n].root;
+}
+
+const char *find_track_root(const char *track) {
+ const struct collection *c = find_track_collection(track);
+ if(c)
+ return c->root;
+ error(0, "found track in no collection '%s'", track);
+ return 0;
}
const char *track_rootless(const char *track) {
}
const char *track_rootless(const char *track) {