diff options
author | drh <> | 2025-05-13 15:09:13 +0000 |
---|---|---|
committer | drh <> | 2025-05-13 15:09:13 +0000 |
commit | 0df6c5b9a70c6c1b87430c7f69f6849c145803b9 (patch) | |
tree | cd2a6f3a25a3c96bb981b0a0a1c0a9d160a036da | |
parent | 0a0777d8458f2c73fd7512cb2c31e628944eb3c6 (diff) | |
download | sqlite-0df6c5b9a70c6c1b87430c7f69f6849c145803b9.tar.gz sqlite-0df6c5b9a70c6c1b87430c7f69f6849c145803b9.zip |
Omit the unused readdir_r() routine from test_windirent.c
FossilOrigin-Name: f9a216e3ad1b3bc9be350aad5ef3dc8b3534d3ee67d160bfedda81a61295320c
-rw-r--r-- | manifest | 16 | ||||
-rw-r--r-- | manifest.uuid | 2 | ||||
-rw-r--r-- | src/test_windirent.c | 45 | ||||
-rw-r--r-- | src/test_windirent.h | 6 |
4 files changed, 11 insertions, 58 deletions
@@ -1,5 +1,5 @@ -C Session\sextension\sdoc\stypo\sfix\sreported\sin\s[forum:75e9408acb|forum\spost\s75e9408acb]. -D 2025-05-12T19:12:50.458 +C Omit\sthe\sunused\sreaddir_r()\sroutine\sfrom\stest_windirent.c +D 2025-05-13T15:09:13.894 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -841,8 +841,8 @@ F src/test_tclvar.c ae873248a0188459b1c16ca7cc431265dacce524399e8b46725c2b3b7e04 F src/test_thread.c 3edb4a5b5aeb1a6e9a275dccc848ac95acab7f496b3e9230f6d2d04953a2b862 F src/test_vdbecov.c 5c426d9cd2b351f5f9ceb30cabf8c64a63bfcad644c507e0bd9ce2f6ae1a3bf3 F src/test_vfs.c b4135c1308516adf0dfd494e6d6c33114e03732be899eace0502919b674586b5 -F src/test_windirent.c a895e2c068a06644eef91a7f0a32182445a893b9a0f33d0cdb4283dca2486ac1 -F src/test_windirent.h da2e5b73c32d09905fbdd00f27cd802212a32a58ead882736fe4f5eb775ebc50 +F src/test_windirent.c 43082333bc8e73e7965c598db074f52721b7ee01248e6a122ca3e50078d838d1 +F src/test_windirent.h 16772b8b3f1ba2801ca5ce39257b385ab0fcd09a9a031ae0cc1209348eebddf8 F src/test_window.c 6d80e11fba89a1796525e6f0048ff0c7789aa2c6b0b11c80827dc1437bd8ea72 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P f0054cc0bce4ed735796da1ea68b7773a582042bdd60fdae4e1af4c592104d15 -R 7fae0df8d1693baf8b24b4433cb26b6c -U stephan -Z 859bebb1db58d472aabb846e1d589c30 +P b96cfff52b4f364388f168198e999ae2407c4afbc7b020f8bb350ab103ffb55c +R c6bd7bd531adacaf4d8be27fe59fb21e +U drh +Z ea9a2abb79b951b73cb14d7586f194ec # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 65b101b59..be332dea1 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b96cfff52b4f364388f168198e999ae2407c4afbc7b020f8bb350ab103ffb55c +f9a216e3ad1b3bc9be350aad5ef3dc8b3534d3ee67d160bfedda81a61295320c diff --git a/src/test_windirent.c b/src/test_windirent.c index 62165c4be..1458e2b1c 100644 --- a/src/test_windirent.c +++ b/src/test_windirent.c @@ -126,51 +126,6 @@ next: } /* -** Implementation of the POSIX readdir_r() function using the MSVCRT. -*/ -INT readdir_r( - LPDIR dirp, - LPDIRENT entry, - LPDIRENT *result -){ - struct _finddata_t data; - - if( dirp==NULL ) return EBADF; - - if( dirp->d_first.d_ino==0 ){ - dirp->d_first.d_ino++; - dirp->d_next.d_ino++; - - entry->d_ino = dirp->d_first.d_ino; - entry->d_attributes = dirp->d_first.d_attributes; - strncpy(entry->d_name, dirp->d_first.d_name, NAME_MAX); - entry->d_name[NAME_MAX] = '\0'; - - *result = entry; - return 0; - } - -next: - - memset(&data, 0, sizeof(struct _finddata_t)); - if( _findnext(dirp->d_handle, &data)==-1 ){ - *result = NULL; - return ENOENT; - } - - /* TODO: Remove this block to allow hidden and/or system files. */ - if( is_filtered(data) ) goto next; - - entry->d_ino = (ino_t)-1; /* not available */ - entry->d_attributes = data.attrib; - strncpy(entry->d_name, data.name, NAME_MAX); - entry->d_name[NAME_MAX] = '\0'; - - *result = entry; - return 0; -} - -/* ** Implementation of the POSIX closedir() function using the MSVCRT. */ INT closedir( diff --git a/src/test_windirent.h b/src/test_windirent.h index 28ce66778..24a888eed 100644 --- a/src/test_windirent.h +++ b/src/test_windirent.h @@ -131,8 +131,7 @@ struct DIR { /* ** Provide a macro, for use by the implementation, to determine if a ** particular directory entry should be skipped over when searching for -** the next directory entry that should be returned by the readdir() or -** readdir_r() functions. +** the next directory entry that should be returned by the readdir(). */ #ifndef is_filtered @@ -148,12 +147,11 @@ extern const char *windirent_getenv(const char *name); /* ** Finally, we can provide the function prototypes for the opendir(), -** readdir(), readdir_r(), and closedir() POSIX functions. +** readdir(), and closedir() POSIX functions. */ extern LPDIR opendir(const char *dirname); extern LPDIRENT readdir(LPDIR dirp); -extern INT readdir_r(LPDIR dirp, LPDIRENT entry, LPDIRENT *result); extern INT closedir(LPDIR dirp); #endif /* defined(WIN32) && defined(_MSC_VER) */ |