]> git.ipfire.org Git - thirdparty/shadow.git/commitdiff
commonio_lock_nowait: Remove deprecated code
authorSamanta Navarro <ferivoz@riseup.net>
Fri, 5 May 2023 11:57:06 +0000 (11:57 +0000)
committerIker Pedrosa <ikerpedrosam@gmail.com>
Fri, 5 May 2023 14:15:46 +0000 (16:15 +0200)
Signed-off-by: Samanta Navarro <ferivoz@riseup.net>
lib/commonio.c

index a0449c83a86e023b52b6c50caa9762750117f369..d95266b79e0b6c7b5d818a6d8ff4008f63e95cfd 100644 (file)
@@ -231,36 +231,18 @@ int do_fcntl_lock (const char *file, bool log, short type)
 
 int commonio_lock_nowait (struct commonio_db *db, bool log)
 {
-       char* file = NULL;
-       char* lock = NULL;
-       size_t lock_file_len;
-       size_t file_len;
        int err = 0;
 
        if (db->locked) {
                return 1;
        }
-       file_len = strlen(db->filename) + 11;/* %lu max size */
-       lock_file_len = strlen(db->filename) + 6; /* sizeof ".lock" */
-       file = MALLOCARRAY(file_len, char);
-       if (file == NULL) {
-               goto cleanup_ENOMEM;
-       }
-       lock = MALLOCARRAY(lock_file_len, char);
-       if (lock == NULL) {
-               goto cleanup_ENOMEM;
-       }
-       snprintf (file, file_len, "%s.%lu",
-                 db->filename, (unsigned long) getpid ());
 
        if (do_fcntl_lock (db->filename, log, F_WRLCK | F_RDLCK) != 0) {
                db->locked = true;
                lock_count++;
                err = 1;
        }
-cleanup_ENOMEM:
-       free(file);
-       free(lock);
+
        return err;
 }