~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fill in some missing actions
[disorder]
/
server
/
macros-disorder.c
diff --git
a/server/macros-disorder.c
b/server/macros-disorder.c
index
f2d9cac
..
a08f0ed
100644
(file)
--- a/
server/macros-disorder.c
+++ b/
server/macros-disorder.c
@@
-158,11
+158,6
@@
static int exp_part(int nargs,
else
return 0;
}
else
return 0;
}
- fprintf(stderr, "track=[%s] part=[%s] context=[%s] dcgi_client=[%p]\n",
- track,
- part,
- !strcmp(context, "short") ? "display" : context,
- dcgi_client);
if(dcgi_client
&& !disorder_part(dcgi_client, &s,
track,
if(dcgi_client
&& !disorder_part(dcgi_client, &s,
track,
@@
-815,19
+810,9
@@
static int exp_image(int attribute((unused)) nargs,
return sink_writes(output, cgi_sgmlquote(url)) < 0 ? -1 : 0;
}
return sink_writes(output, cgi_sgmlquote(url)) < 0 ? -1 : 0;
}
-/** @brief Entry in a list of tracks or directories */
-struct entry {
- /** @brief Track name */
- const char *track;
- /** @brief Sort key */
- const char *sort;
- /** @brief Display key */
- const char *display;
-};
-
/** @brief Compare two @ref entry objects */
/** @brief Compare two @ref entry objects */
-
static int
compare_entry(const void *a, const void *b) {
- const struct entry *ea = a, *eb = b;
+
int dcgi_
compare_entry(const void *a, const void *b) {
+ const struct
dcgi_
entry *ea = a, *eb = b;
return compare_tracks(ea->sort, eb->sort,
ea->display, eb->display,
return compare_tracks(ea->sort, eb->sort,
ea->display, eb->display,
@@
-848,7
+833,7
@@
static int exp__files_dirs(int nargs,
char **tracks, *dir, *re;
int n, ntracks, rc;
const struct mx_node *m;
char **tracks, *dir, *re;
int n, ntracks, rc;
const struct mx_node *m;
- struct entry *e;
+ struct
dcgi_
entry *e;
if((rc = mx_expandstr(args[0], &dir, u, "argument #0 (DIR)")))
return rc;
if((rc = mx_expandstr(args[0], &dir, u, "argument #0 (DIR)")))
return rc;
@@
-873,7
+858,7
@@
static int exp__files_dirs(int nargs,
e[n].sort = trackname_transform(type, tracks[n], "sort");
e[n].display = trackname_transform(type, tracks[n], "display");
}
e[n].sort = trackname_transform(type, tracks[n], "sort");
e[n].display = trackname_transform(type, tracks[n], "display");
}
- qsort(e, ntracks, sizeof (struct
entry),
compare_entry);
+ qsort(e, ntracks, sizeof (struct
dcgi_entry), dcgi_
compare_entry);
/* Expand the subsiduary templates. We chuck in @sort and @display because
* it is particularly easy to do so. */
for(n = 0; n < ntracks; ++n)
/* Expand the subsiduary templates. We chuck in @sort and @display because
* it is particularly easy to do so. */
for(n = 0; n < ntracks; ++n)