speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
6
2
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

win32.cpp: Fix syntax errors

Browse source 
This file was originally in C99 and (poorly) adapted to C++, which
caused some syntax errors as C++ holds different rules compared
to C99.


git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9494 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: d7020315ae5cd1d5657c44695ec321e15be7545f
Former-commit-id: 2a88f57ba6e41584074a6410edcecf39463f868a
This commit is contained in:
xavi92 2024-07-19 15:17:40 +00:00
parent b433af1e9a
commit 5ee1a1adcf
1 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/libs/portability/win32.cpp
View file

@ -8,21 +8,21 @@
* (at your option) any later version. * (at your option) any later version.
*/ */
#include "portability.h"
#include <windows.h> #include <windows.h>
#include <winerror.h> #include <winerror.h>
#include <shellapi.h> #include <shellapi.h>
#include <errno.h> #include <cerrno>
#include <stddef.h> #include <cstddef>
#include <stdlib.h> #include <cstdlib>
#include <stdio.h> #include <cstdio>
#include <string.h> #include <cstring>
static char *getdir(const char *path) static char *getdir(const char *path)
{ {
/* SHFileOperation requires a double null-terminated string. */ /* SHFileOperation requires a double null-terminated string. */
size_t sz = strlen(path) + sizeof (const char[]){'\0', '\0'}; static const char end[] = {'\0', '\0'};
char *ret = malloc(sz); size_t sz = strlen(path) + sizeof end;
char *ret = static_cast<char *>(malloc(sz));
if (!ret) if (!ret)
{ {
@ -36,13 +36,14 @@ static char *getdir(const char *path)
failure: failure:
free(ret); free(ret);
return NULL; return nullptr;
} }
int portability::rmdir_r(const char *path) int portability::rmdir_r(const char *path)
{ {
int ret = -1; int ret = -1, res;
char *dir = dir = getdir(path); char *dir = getdir(path);
SHFILEOPSTRUCT op = {0};
if (!dir) if (!dir)
{ {
@ -50,16 +51,12 @@ int portability::rmdir_r(const char *path)
goto end; goto end;
} }
SHFILEOPSTRUCT op = { op.wFunc = FO_DELETE;
.wFunc = FO_DELETE, op.fFlags = FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_SILENT;
.pFrom = dir, op.lpszProgressTitle = "";
.fFlags = FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_SILENT, op.pFrom = dir;
.lpszProgressTitle = ""
};
int res = SHFileOperation(&op); if ((res = SHFileOperation(&op)))
if (res)
{ {
fprintf(stderr, "%s: SHFileOperation failed with %#x\n", __func__, res); fprintf(stderr, "%s: SHFileOperation failed with %#x\n", __func__, res);
goto end; goto end;