Skip to content

Commit 6ad8e68

Browse files
committed
Global: simplifies code with __auto_type
1 parent b128260 commit 6ad8e68

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/common/library.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ static inline void ffLibraryUnload(void** handle)
5252
return returnValue;
5353

5454
#define FF_LIBRARY_LOAD_SYMBOL(library, symbolName, returnValue) \
55-
__typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, returnValue);
55+
__auto_type FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, returnValue);
5656

5757
#define FF_LIBRARY_LOAD_SYMBOL_LAZY(library, symbolName) \
58-
__typeof__(&symbolName) ff ## symbolName = (__typeof__(&symbolName)) dlsym(library, #symbolName);
58+
__auto_type ff ## symbolName = (__typeof__(&symbolName)) dlsym(library, #symbolName);
5959

6060
#define FF_LIBRARY_LOAD_SYMBOL_MESSAGE(library, symbolName) \
61-
__typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, "dlsym " #symbolName " failed");
61+
__auto_type FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, "dlsym " #symbolName " failed");
6262

6363
#define FF_LIBRARY_LOAD_SYMBOL_VAR(library, varName, symbolName, returnValue) \
6464
FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName).ff ## symbolName, symbolName, returnValue);
@@ -88,13 +88,13 @@ void* ffLibraryLoad(const char* path, int maxVersion, ...);
8888
symbolMapping = (__typeof__(&symbolName)) &symbolName;
8989

9090
#define FF_LIBRARY_LOAD_SYMBOL(library, symbolName, returnValue) \
91-
FF_MAYBE_UNUSED __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, returnValue);
91+
FF_MAYBE_UNUSED __auto_type FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, returnValue);
9292

9393
#define FF_LIBRARY_LOAD_SYMBOL_LAZY(library, symbolName) \
94-
FF_MAYBE_UNUSED __typeof__(&symbolName) ff ## symbolName = (__typeof__(&symbolName)) &symbolName;
94+
FF_MAYBE_UNUSED __auto_type ff ## symbolName = (__typeof__(&symbolName)) &symbolName;
9595

9696
#define FF_LIBRARY_LOAD_SYMBOL_MESSAGE(library, symbolName) \
97-
FF_MAYBE_UNUSED __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, "dlsym " #symbolName " failed");
97+
FF_MAYBE_UNUSED __auto_type FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, "dlsym " #symbolName " failed");
9898

9999
#define FF_LIBRARY_LOAD_SYMBOL_VAR(library, varName, symbolName, returnValue) \
100100
FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName).ff ## symbolName, symbolName, returnValue);

src/detection/physicaldisk/physicaldisk_windows.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ static bool detectPhysicalDisk(const wchar_t* szDevice, FFlist* result, FFPhysic
152152
// DiskInfo and RemovableDiskInfo have the same structures. TapeInfo doesn't.
153153
if (gmt->DeviceType != FILE_DEVICE_TAPE)
154154
{
155-
__typeof__(gmt->MediaInfo[0].DeviceSpecific.DiskInfo)* diskInfo = &gmt->MediaInfo[0].DeviceSpecific.DiskInfo;
155+
__auto_type diskInfo = &gmt->MediaInfo[0].DeviceSpecific.DiskInfo;
156156
if (diskInfo->MediaCharacteristics & MEDIA_READ_ONLY)
157157
device->type |= FF_PHYSICALDISK_TYPE_READONLY;
158158
else if (diskInfo->MediaCharacteristics & MEDIA_READ_WRITE)
@@ -162,7 +162,7 @@ static bool detectPhysicalDisk(const wchar_t* szDevice, FFlist* result, FFPhysic
162162
}
163163
else
164164
{
165-
__typeof__(gmt->MediaInfo[0].DeviceSpecific.TapeInfo)* tapeInfo = &gmt->MediaInfo[0].DeviceSpecific.TapeInfo;
165+
__auto_type tapeInfo = &gmt->MediaInfo[0].DeviceSpecific.TapeInfo;
166166
if (tapeInfo->MediaCharacteristics & MEDIA_READ_ONLY)
167167
device->type |= FF_PHYSICALDISK_TYPE_READONLY;
168168
else if (tapeInfo->MediaCharacteristics & MEDIA_READ_WRITE)

0 commit comments

Comments
 (0)