Assume initial digits in a track name are a sort key even without the

[disorder] / lib / macros.h

diff --git a/lib/macros.h b/lib/macros.h
index 49c6834651fe0a03bc9f6382e7b1694ffda32b92..e9b0af5250f1166ea796a6a199196b00b79f189e 100644 (file)
--- a/lib/macros.h
+++ b/lib/macros.h
@@ -42,10 +42,10 @@ struct mx_node {
   int line;
   
   /** @brief Plain text (if @p type is @ref MX_TEXT) */
   int line;
   
   /** @brief Plain text (if @p type is @ref MX_TEXT) */

-  char *text;
+  const char *text;

 
   /** @brief Expansion name (if @p type is @ref MX_EXPANSION) */
 
   /** @brief Expansion name (if @p type is @ref MX_EXPANSION) */

-  char *name;
+  const char *name;

 
   /** @brief Argument count (if @p type is @ref MX_EXPANSION) */
   int nargs;
 
   /** @brief Argument count (if @p type is @ref MX_EXPANSION) */
   int nargs;


@@ -106,7 +106,7 @@ int mx_register_macro(const char *name,
 
 void mx_register_builtin(void);
 void mx_search_path(const char *s);
 
 void mx_register_builtin(void);
 void mx_search_path(const char *s);

-char *mx_find(const char *name);
+char *mx_find(const char *name, int report);

 
 int mx_expand_file(const char *path,
                    struct sink *output,
 
 int mx_expand_file(const char *path,
                    struct sink *output,


@@ -125,6 +125,7 @@ const struct mx_node *mx_rewritel(const struct mx_node *m,
 
 int mx_str2bool(const char *s);
 const char *mx_bool2str(int n);
 
 int mx_str2bool(const char *s);
 const char *mx_bool2str(int n);

+int mx_bool_result(struct sink *output, int result);

 
 #endif /* MACROS_H */
 
 
 #endif /* MACROS_H */