chiark
/
gitweb
/
~mdw
/
disorder
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7e60b67
)
build fix
author
Richard Kettlewell
<rjk@greenend.org.uk>
Wed, 3 Oct 2007 17:47:39 +0000
(18:47 +0100)
committer
Richard Kettlewell
<rjk@greenend.org.uk>
Wed, 3 Oct 2007 17:47:39 +0000
(18:47 +0100)
disobedience/choose.c
patch
|
blob
|
blame
|
history
diff --git
a/disobedience/choose.c
b/disobedience/choose.c
index 6ab1128a9852fd056bda5fc1e923c68c677dac67..cb68bb5b67cabaf63954a18fd1733bb0066c2525 100644
(file)
--- a/
disobedience/choose.c
+++ b/
disobedience/choose.c
@@
-200,7
+200,7
@@
static struct choose_menuitem dir_menuitems[] = {
/* Maintaining the data structure ------------------------------------------ */
/* Maintaining the data structure ------------------------------------------ */
-static char *flags(const struct choosenode *cn) {
+static char *
cn
flags(const struct choosenode *cn) {
unsigned f = cn->flags, n;
struct dynstr d[1];
unsigned f = cn->flags, n;
struct dynstr d[1];
@@
-359,7
+359,7
@@
static void got_files(void *v, int nvec, char **vec) {
struct choosenode *cn = cbd->u.choosenode;
int n;
struct choosenode *cn = cbd->u.choosenode;
int n;
- D(("got_files %d files for %s %s", nvec, cn->path, flags(cn)));
+ D(("got_files %d files for %s %s", nvec, cn->path,
cn
flags(cn)));
/* Complicated by the need to resolve aliases. We can save a bit of effort
* by re-using cbd though. */
cn->flags &= ~CN_GETTING_FILES;
/* Complicated by the need to resolve aliases. We can save a bit of effort
* by re-using cbd though. */
cn->flags &= ~CN_GETTING_FILES;
@@
-382,7
+382,7
@@
static void got_resolved_file(void *v, const char *track) {
struct callbackdata *cbd = v;
struct choosenode *cn = cbd->u.choosenode, *file_cn;
struct callbackdata *cbd = v;
struct choosenode *cn = cbd->u.choosenode, *file_cn;
- D(("resolved %s %s %d left", cn->path, flags(cn), cn->pending - 1));
+ D(("resolved %s %s %d left", cn->path,
cn
flags(cn), cn->pending - 1));
/* TODO as below */
file_cn = newnode(cn, track,
trackname_transform("track", track, "display"),
/* TODO as below */
file_cn = newnode(cn, track,
trackname_transform("track", track, "display"),
@@
-404,7
+404,7
@@
static void got_dirs(void *v, int nvec, char **vec) {
struct choosenode *cn = cbd->u.choosenode;
int n;
struct choosenode *cn = cbd->u.choosenode;
int n;
- D(("got_dirs %d dirs for %s %s", nvec, cn->path, flags(cn)));
+ D(("got_dirs %d dirs for %s %s", nvec, cn->path,
cn
flags(cn)));
/* TODO this depends on local configuration for trackname_transform().
* This will work, since the defaults are now built-in, but it'll be
* (potentially) different to the server's configured settings.
/* TODO this depends on local configuration for trackname_transform().
* This will work, since the defaults are now built-in, but it'll be
* (potentially) different to the server's configured settings.
@@
-447,7
+447,7
@@
static void fill_directory_node(struct choosenode *cn) {
/** @brief Expand a node */
static void expand_node(struct choosenode *cn, int contingent) {
/** @brief Expand a node */
static void expand_node(struct choosenode *cn, int contingent) {
- D(("expand_node %s %d %s", cn->path, contingent, flags(cn)));
+ D(("expand_node %s %d %s", cn->path, contingent,
cn
flags(cn)));
assert(cn->flags & CN_EXPANDABLE);
/* If node is already expanded do nothing. */
if(cn->flags & CN_EXPANDED) return;
assert(cn->flags & CN_EXPANDABLE);
/* If node is already expanded do nothing. */
if(cn->flags & CN_EXPANDED) return;