]> Savannah Git Hosting - gnulib.git/commitdiff
backupfile: Use idx_t for nonnegative ptrdiff_t variables.
authorBruno Haible <bruno@clisp.org>
Sun, 6 Dec 2020 11:30:42 +0000 (12:30 +0100)
committerBruno Haible <bruno@clisp.org>
Sun, 6 Dec 2020 11:30:59 +0000 (12:30 +0100)
* lib/backupfile.c: Include idx.h.
(numbered_backup): Mark base_offset as nonnegative.
(backupfile_internal): Likewise.
* modules/backup-rename (Depends-on): Add idx.
* modules/backupfile (Depends-on): Likewise.

ChangeLog
lib/backupfile.c
modules/backup-rename
modules/backupfile

index 5378f177a360394b6b12a7aae6f5c1cfe142c1c8..e0495a0c47b04ae5444c2649d322b49ef0b41fcd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2020-12-06  Bruno Haible  <bruno@clisp.org>
+
+       backupfile: Use idx_t for nonnegative ptrdiff_t variables.
+       * lib/backupfile.c: Include idx.h.
+       (numbered_backup): Mark base_offset as nonnegative.
+       (backupfile_internal): Likewise.
+       * modules/backup-rename (Depends-on): Add idx.
+       * modules/backupfile (Depends-on): Likewise.
+
 2020-12-05  Paul Eggert  <eggert@cs.ucla.edu>
 
        doc: fix curved quotes issue
index 2a88248d7f0ea1f8e0dd4366e44ec2d6fcd8a193..dfc29e84863d16f28ccc3813ca591a7399e903a7 100644 (file)
 
 #include "backup-internal.h"
 
-#include "attribute.h"
-#include "basename-lgpl.h"
-#include "opendirat.h"
-#include "renameatu.h"
-#include "xalloc-oversized.h"
-
 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>
 #include <string.h>
 #include <unistd.h>
 
+#include "attribute.h"
+#include "basename-lgpl.h"
+#include "idx.h"
+#include "opendirat.h"
+#include "renameatu.h"
+#include "xalloc-oversized.h"
+
 #ifndef _D_EXACT_NAMLEN
 # define _D_EXACT_NAMLEN(dp) strlen ((dp)->d_name)
 #endif
@@ -198,7 +199,7 @@ enum numbered_backup_result
 
 static enum numbered_backup_result
 numbered_backup (int dir_fd, char **buffer, size_t buffer_size, size_t filelen,
-                 ptrdiff_t base_offset, DIR **dirpp, int *pnew_fd)
+                 idx_t base_offset, DIR **dirpp, int *pnew_fd)
 {
   enum numbered_backup_result result = BACKUP_IS_NEW;
   DIR *dirp = *dirpp;
@@ -307,7 +308,7 @@ char *
 backupfile_internal (int dir_fd, char const *file,
                      enum backup_type backup_type, bool rename)
 {
-  ptrdiff_t base_offset = last_component (file) - file;
+  idx_t base_offset = last_component (file) - file;
   size_t filelen = base_offset + strlen (file + base_offset);
 
   if (! simple_backup_suffix)
index cdc96e6f03dbecea7a8745c109661532e519e755..d4bd339d77b827016b1e42820a9f1f998171b3e6 100644 (file)
@@ -17,6 +17,7 @@ closedir
 d-ino
 dirent-safer
 fcntl
+idx
 memcmp
 opendirat
 readdir
index 2ca1e540e23342ce8bfb5c8f872c0f7fca3dddb0..fd15ec504438f23d15720fd96afb214a3da9dd5d 100644 (file)
@@ -17,6 +17,7 @@ closedir
 d-ino
 dirent-safer
 fcntl
+idx
 memcmp
 opendirat
 readdir