Merge tag 'branchpoint-5.1' into release

[disorder] / cgi / macros-disorder.c

diff --git a/cgi/macros-disorder.c b/cgi/macros-disorder.c
index 7c369e1519f7b63e43dc258203a6efce2b75fc15..1ef1ee1f3d0ed4f8e2db80197f0b0ecd6b87e41e 100644 (file)
--- a/cgi/macros-disorder.c
+++ b/cgi/macros-disorder.c
@@ -458,7 +458,7 @@ static int exp_volume(int attribute((unused)) nargs,
                       struct sink *output,
                       void attribute((unused)) *u) {
   dcgi_lookup(DCGI_VOLUME);
                       struct sink *output,
                       void attribute((unused)) *u) {
   dcgi_lookup(DCGI_VOLUME);

-  return sink_printf(output, "%d",
+  return sink_printf(output, "%ld",

                      !strcmp(args[0], "left")
                          ? dcgi_volume_left : dcgi_volume_right) < 0 ? -1 : 0;
 }
                      !strcmp(args[0], "left")
                          ? dcgi_volume_left : dcgi_volume_right) < 0 ? -1 : 0;
 }


@@ -931,7 +931,7 @@ static int exp_dirs(int nargs,
                     const struct mx_node **args,
                     struct sink *output,
                     void *u) {
                     const struct mx_node **args,
                     struct sink *output,
                     void *u) {

-  return exp__files_dirs(nargs, args, output, u, "dir", disorder_directories);
+  return exp__files_dirs(nargs, args, output, u, "dir", disorder_dirs);

 }
 
 static int exp__search_shim(disorder_client *c, const char *terms,
 }
 
 static int exp__search_shim(disorder_client *c, const char *terms,