Additional cstyle fixes

andrewc12 · Aug 26, 2022 · 6156801 · 6156801
1 parent fd3a1dd
commit 6156801
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 13 deletions.
diff --git a/include/os/windows/spl/sys/linker_set.h b/include/os/windows/spl/sys/linker_set.h
@@ -110,7 +110,7 @@
  */
 #define	TEXT_SET(set, sym)	__MAKE_SET(set, sym)
 #define	DATA_SET(set, sym)	__MAKE_SET(set, sym)
-#define	DATA_WSET(set, sym)	__MAKE_SET_QV(set, sym,)
+#define	DATA_WSET(set, sym)	__MAKE_SET_QV(set, sym, /* */)
 #define	BSS_SET(set, sym)	__MAKE_SET(set, sym)
 #define	ABS_SET(set, sym)	__MAKE_SET(set, sym)
 #define	SET_ENTRY(set, sym)	__MAKE_SET(set, sym)

diff --git a/lib/libspl/include/os/windows/string.h b/lib/libspl/include/os/windows/string.h
@@ -23,8 +23,6 @@
 #ifndef _LIBSPL_WINDOWS_STRING_H
 #define	_LIBSPL_WINDOWS_STRING_H
 
-#pragma message("this we want")
-
 #include_next <string.h>
 
 static inline char *

diff --git a/lib/libspl/os/windows/posix.c b/lib/libspl/os/windows/posix.c
@@ -927,7 +927,7 @@ wosix_open(const char *inpath, int oflag, ...)
 
 	h = CreateFile(path, mode, share, NULL, how,
 	    oflag & O_DIRECTORY ? FILE_FLAG_BACKUP_SEMANTICS : \
-		FILE_ATTRIBUTE_NORMAL,
+	    FILE_ATTRIBUTE_NORMAL,
 	    NULL);
 
 	// Could be a directory (but we come from stat so no O_DIRECTORY)
@@ -947,7 +947,7 @@ wosix_open(const char *inpath, int oflag, ...)
 
 		h = CreateFile(end, mode, share, NULL, how,
 		    oflag & O_DIRECTORY ? FILE_FLAG_BACKUP_SEMANTICS : \
-			FILE_ATTRIBUTE_NORMAL,
+		    FILE_ATTRIBUTE_NORMAL,
 		    NULL);
 		if (h != INVALID_HANDLE_VALUE) {
 			// Upper layer probably handles this, but let's help

diff --git a/module/os/windows/zfs/zfs_vnops_os.c b/module/os/windows/zfs/zfs_vnops_os.c
@@ -1845,7 +1845,7 @@ zfs_readdir(vnode_t *vp, zfs_uio_t *uio, cred_t *cr, zfs_dirlist_t *zccb,
 					eodp =
 					    (FILE_FULL_DIR_INFORMATION *)bufptr;
 					FILE_ID_EXTD_BOTH_DIR_INFORMATION
-					    *fiebdi;
+					*fiebdi;
 					fiebdi =
 					    (FILE_ID_EXTD_BOTH_DIR_INFORMATION
 					    *)bufptr;

diff --git a/module/os/windows/zfs/zfs_vnops_windows.c b/module/os/windows/zfs/zfs_vnops_windows.c
@@ -3110,8 +3110,8 @@ request_oplock(PDEVICE_OBJECT DeviceObject, PIRP *PIrp,
 					    &vp->FileHeader.AllocationSize);
 				else if
 				    (fFsRtlAreThereCurrentOrInProgressFileLocks)
-					oplock_count =
-	    fFsRtlAreThereCurrentOrInProgressFileLocks(&vp->lock);
+		oplock_count =
+		    fFsRtlAreThereCurrentOrInProgressFileLocks(&vp->lock);
 				else
 					oplock_count =
 					    FsRtlAreThereCurrentFileLocks(&vp->

diff --git a/module/os/windows/zfs/zfs_windows_zvol_wmi.c b/module/os/windows/zfs/zfs_windows_zvol_wmi.c
@@ -783,18 +783,17 @@ ExecuteWmiMethod(
 					PGetDiscoveredPortAttributes_OUT pOut =
 					    (PGetDiscoveredPortAttributes_OUT)
 					    pBuffer;
-					sizeNeeded =
-	    GetDiscoveredPortAttributes_OUT_SIZE;
+		sizeNeeded =
+		    GetDiscoveredPortAttributes_OUT_SIZE;
 
 					if (OutBufferSize >= sizeNeeded) {
 						memset(pOut, 0, sizeNeeded);
 
 						// since this is a virtual
 						// driver with no discovered
 						// ports,always return an error
-						pOut->
-						    HBAStatus =
-	    HBA_STATUS_ERROR_ILLEGAL_INDEX;
+		pOut->HBAStatus =
+		    HBA_STATUS_ERROR_ILLEGAL_INDEX;
 					} else {
 						status =
 						    SRB_STATUS_DATA_OVERRUN;