Update directory-files{,-recur} argument checking

       * dired.c(Fdirectory_files): Ensure directory is a string.
       (Fdirectory_files_recur): Remove check for match. It is done in
       directory_files_magic, which also will allow for a predicate.

Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>

diff --git a/src/dired.c b/src/dired.c
index 0b51f2c..981edaf 100644 (file)
--- a/src/dired.c
+++ b/src/dired.c
@@ -648,6 +648,10 @@ Optional argument FILES-ONLY can be one of:
                .fullp = !NILP(full),
                .symlink_file_p = 0,
        };
+
+       /* argument checks */
+       CHECK_STRING(directory);
+
        GCPRO6(directory, full, match, result_type, files_only, result);
 
        directory = directory_files_canonicalise_dn(directory);
@@ -733,9 +737,6 @@ to put results in addition to the ordinary result list.
 
        /* argument checks */
        CHECK_STRING(directory);
-       if (!NILP(match)) {
-               CHECK_STRING(match);
-       }
        if (!NILP(maxdepth)) {
                CHECK_NATNUM(maxdepth);
                opts.maxdepth = XUINT(maxdepth);