From 1fa25644d1c7ce63218796762e61176a89f6ad9f Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 14 Mar 2021 18:50:14 +0000 Subject: [PATCH] Remove some unused code. --- setter/src/dos/os.c | 3 --- setter/src/macos/filename.c | 3 +-- setter/src/macos/files.c | 7 ++----- setter/src/os2/32bit/xattr.c | 12 +----------- setter/src/os2/os2.h | 2 +- setter/src/unix/deleted.c | 2 +- setter/src/unix/filename.c | 2 +- setter/src/win32/deleted.c | 2 +- setter/src/win32/filename.c | 2 +- setter/src/win32/files.c | 2 +- setter/src/win32/frag.c | 12 +----------- setter/src/win32/perms.c | 1 - setter/src/win32/xattr.c | 9 --------- 13 files changed, 11 insertions(+), 48 deletions(-) diff --git a/setter/src/dos/os.c b/setter/src/dos/os.c index 5afdcdf..bae0b4c 100644 --- a/setter/src/dos/os.c +++ b/setter/src/dos/os.c @@ -74,15 +74,12 @@ void GetOsInfo() case DOS_FLAVOR_WINME: printf("Will not run under Windows 9x. Exiting...\n"); exit(1); - break; case DOS_FLAVOR_WINNT: printf("Will not run under Windows NT. Exiting...\n"); exit(1); - break; case DOS_FLAVOR_OS2: printf("Will not run under OS/2. Exiting...\n"); exit(1); - break; case DOS_FLAVOR_PTSDOS: printf("OS information:\n"); printf("\tRunning under PTS-DOS %d.%d\n", dosuname_version.major, dosuname_version.minor); diff --git a/setter/src/macos/filename.c b/setter/src/macos/filename.c index 9c7ed80..48f474e 100644 --- a/setter/src/macos/filename.c +++ b/setter/src/macos/filename.c @@ -49,10 +49,9 @@ void Filenames(const char* path) int16_t refNum; int16_t refFile; int32_t dirId; - FInfo finderInfo; int32_t count; char message[300]; - int pos = 0; + int pos; HParamBlockRec dirPB; snprintf((char*)str255, 255, "%s", path); diff --git a/setter/src/macos/files.c b/setter/src/macos/files.c index 54739fb..0493c32 100644 --- a/setter/src/macos/files.c +++ b/setter/src/macos/files.c @@ -43,16 +43,13 @@ Copyright (C) 2011-2021 Natalia Portillo void MillionFiles(const char* path) { - OSErr rc, wRc, cRc; + OSErr rc; Str255 str255; HVolumeParam hpb; int16_t refNum; - int16_t refFile; int32_t dirId; - FInfo finderInfo; - int32_t count; char filename[9]; - int pos = 0; + int pos; HParamBlockRec dirPB; snprintf((char*)str255, 255, "%s", path); diff --git a/setter/src/os2/32bit/xattr.c b/setter/src/os2/32bit/xattr.c index 8f1c16c..74c7346 100644 --- a/setter/src/os2/32bit/xattr.c +++ b/setter/src/os2/32bit/xattr.c @@ -27,17 +27,7 @@ Contains 32-bit OS/2 code Copyright (C) 2011-2021 Natalia Portillo *****************************************************************************/ -#define INCL_DOSMISC -#define INCL_DOSFILEMGR - -#include -#include -#include -#include - -#include "../os2.h" -#include "include/consts.h" -#include "include/defs.h" +#include "../../include/defs.h" void ExtendedAttributes(const char* path) { /* TODO: Implement */ diff --git a/setter/src/os2/os2.h b/setter/src/os2/os2.h index 393ab7e..0b4e494 100644 --- a/setter/src/os2/os2.h +++ b/setter/src/os2/os2.h @@ -86,7 +86,7 @@ Copyright (C) 2011-2021 Natalia Portillo #define __os2_chdir(path) DosSetCurrentDir(path) #define __os2_mkdir(path) DosCreateDir(path, NULL) -#define __os2_delete(path) DosDelete(path); +#define __os2_delete(path) DosDelete(path) #endif diff --git a/setter/src/unix/deleted.c b/setter/src/unix/deleted.c index 6c39e6a..1618d6f 100644 --- a/setter/src/unix/deleted.c +++ b/setter/src/unix/deleted.c @@ -39,7 +39,7 @@ Copyright (C) 2011-2021 Natalia Portillo void DeleteFiles(const char* path) { char filename[9]; - long pos = 0; + long pos; FILE* h; int ret; diff --git a/setter/src/unix/filename.c b/setter/src/unix/filename.c index a5c9cd2..debd783 100644 --- a/setter/src/unix/filename.c +++ b/setter/src/unix/filename.c @@ -42,7 +42,7 @@ void Filenames(const char* path) FILE* h; int rc, wRc, cRc; char message[300]; - int pos = 0; + int pos; ret = chdir(path); diff --git a/setter/src/win32/deleted.c b/setter/src/win32/deleted.c index 474add1..f9e11a8 100644 --- a/setter/src/win32/deleted.c +++ b/setter/src/win32/deleted.c @@ -43,7 +43,7 @@ Copyright (C) 2011-2021 Natalia Portillo void DeleteFiles(const char* path) { char filename[9]; - DWORD pos = 0; + DWORD pos; HANDLE h; BOOL ret; DWORD error; diff --git a/setter/src/win32/filename.c b/setter/src/win32/filename.c index f1abd84..7c38dc2 100644 --- a/setter/src/win32/filename.c +++ b/setter/src/win32/filename.c @@ -51,7 +51,7 @@ void Filenames(const char* path) DWORD dwNumberOfBytesWritten; DWORD rc, wRc, cRc; char message[300]; - int pos = 0; + int pos; lpRootPathName = malloc(dwMaxNameSize); diff --git a/setter/src/win32/files.c b/setter/src/win32/files.c index 9bad770..d2be6b5 100644 --- a/setter/src/win32/files.c +++ b/setter/src/win32/files.c @@ -43,7 +43,7 @@ Copyright (C) 2011-2021 Natalia Portillo void MillionFiles(const char* path) { char filename[9]; - DWORD pos = 0; + DWORD pos; HANDLE h; BOOL ret; DWORD error; diff --git a/setter/src/win32/frag.c b/setter/src/win32/frag.c index 05f80d6..b54e33c 100644 --- a/setter/src/win32/frag.c +++ b/setter/src/win32/frag.c @@ -55,7 +55,7 @@ void Fragmentation(const char* path, size_t clusterSize) LPSTR lpRootPathName; const size_t pathSize = strlen(path); HANDLE h; - DWORD rc, wRc, cRc, tRc; + DWORD rc, wRc, cRc; DWORD dwNumberOfBytesWritten; lpRootPathName = malloc(dwMaxNameSize); @@ -102,7 +102,6 @@ void Fragmentation(const char* path, size_t clusterSize) rc = 0; wRc = 0; cRc = 0; - tRc = 0; if(h == INVALID_HANDLE_VALUE) rc = GetLastError(); else { @@ -125,7 +124,6 @@ void Fragmentation(const char* path, size_t clusterSize) rc = 0; wRc = 0; cRc = 0; - tRc = 0; if(h == INVALID_HANDLE_VALUE) rc = GetLastError(); else { @@ -149,7 +147,6 @@ void Fragmentation(const char* path, size_t clusterSize) rc = 0; wRc = 0; cRc = 0; - tRc = 0; if(h == INVALID_HANDLE_VALUE) rc = GetLastError(); else { @@ -172,7 +169,6 @@ void Fragmentation(const char* path, size_t clusterSize) rc = 0; wRc = 0; cRc = 0; - tRc = 0; if(h == INVALID_HANDLE_VALUE) rc = GetLastError(); else { @@ -200,7 +196,6 @@ void Fragmentation(const char* path, size_t clusterSize) rc = 0; wRc = 0; cRc = 0; - tRc = 0; if(h == INVALID_HANDLE_VALUE) rc = GetLastError(); else { @@ -228,7 +223,6 @@ void Fragmentation(const char* path, size_t clusterSize) rc = 0; wRc = 0; cRc = 0; - tRc = 0; if(h == INVALID_HANDLE_VALUE) rc = GetLastError(); else { @@ -251,7 +245,6 @@ void Fragmentation(const char* path, size_t clusterSize) rc = 0; wRc = 0; cRc = 0; - tRc = 0; if(h == INVALID_HANDLE_VALUE) rc = GetLastError(); else { @@ -274,7 +267,6 @@ void Fragmentation(const char* path, size_t clusterSize) rc = 0; wRc = 0; cRc = 0; - tRc = 0; if(h == INVALID_HANDLE_VALUE) rc = GetLastError(); else { @@ -301,7 +293,6 @@ void Fragmentation(const char* path, size_t clusterSize) rc = 0; wRc = 0; cRc = 0; - tRc = 0; if(h == INVALID_HANDLE_VALUE) rc = GetLastError(); else { @@ -336,7 +327,6 @@ void Fragmentation(const char* path, size_t clusterSize) rc = 0; wRc = 0; cRc = 0; - tRc = 0; if(h == INVALID_HANDLE_VALUE) rc = GetLastError(); else { diff --git a/setter/src/win32/perms.c b/setter/src/win32/perms.c index 700df09..87acb59 100644 --- a/setter/src/win32/perms.c +++ b/setter/src/win32/perms.c @@ -29,7 +29,6 @@ Copyright (C) 2011-2021 Natalia Portillo // ReSharper disable CppJoinDeclarationAndAssignment // ReSharper disable CppDeprecatedEntity -#define _CRT_SECURE_NO_WARNINGS 1 #include "../include/defs.h" diff --git a/setter/src/win32/xattr.c b/setter/src/win32/xattr.c index 4100c29..c65c6ca 100644 --- a/setter/src/win32/xattr.c +++ b/setter/src/win32/xattr.c @@ -163,9 +163,6 @@ void ExtendedAttributes(const char* path) printf("Creating files with extended attributes.\n"); - rc = 0; - wRc = 0; - cRc = 0; rRc = 0; cmp = TRUE; h = CreateFileA("COMMENTS", @@ -225,9 +222,6 @@ void ExtendedAttributes(const char* path) rRc, cmp); - rc = 0; - wRc = 0; - cRc = 0; rRc = 0; cmp = TRUE; h = CreateFileA("COMMENTS.CRT", @@ -287,9 +281,6 @@ void ExtendedAttributes(const char* path) rRc, cmp); - rc = 0; - wRc = 0; - cRc = 0; rRc = 0; cmp = TRUE; h = CreateFileA("ICON",