i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PackageKit: Fix BPackageInfoAttributeValue::Clear for GCC2.

Browse Source 
These are simple structs, so hopefully GCC8 will be OK with us
memsetting them. We can't use the standard = {} route because
GCC2 does not support that.
This commit is contained in:
Augustin Cavalier
2019-03-03 17:04:22 -05:00
parent 3e57265251
commit ee735d1b33
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/package/hpkg/PackageInfoAttributeValue.h
+21 -21
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2009,2011, Haiku, Inc. * Copyright 2009-2011, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _PACKAGE__HPKG__PACKAGE_INFO_ATTRIBUTE_VALUE_H_ #ifndef _PACKAGE__HPKG__PACKAGE_INFO_ATTRIBUTE_VALUE_H_
@@ -22,28 +22,28 @@ namespace BHPKG {
struct BPackageVersionData { struct BPackageVersionData {
const char* major; const char* major;
const char* minor; const char* minor;
const char* micro; const char* micro;
const char* preRelease; const char* preRelease;
uint32 revision; uint32 revision;
}; };
struct BPackageResolvableData { struct BPackageResolvableData {
const char* name; const char* name;
bool haveVersion; bool haveVersion;
bool haveCompatibleVersion; bool haveCompatibleVersion;
BPackageVersionData version; BPackageVersionData version;
BPackageVersionData compatibleVersion; BPackageVersionData compatibleVersion;
}; };
struct BPackageResolvableExpressionData { struct BPackageResolvableExpressionData {
const char* name; const char* name;
bool haveOpAndVersion; bool haveOpAndVersion;
BPackageResolvableOperator op; BPackageResolvableOperator op;
BPackageVersionData version; BPackageVersionData version;
}; };
@@ -125,12 +125,12 @@ BPackageInfoAttributeValue::Clear()
{ {
unsignedInt = 0; unsignedInt = 0;
string = NULL; string = NULL;
version = {}; memset(&version, 0, sizeof(version));
resolvable = {}; memset(&resolvable, 0, sizeof(resolvable));
resolvableExpression = {}; memset(&resolvableExpression, 0, sizeof(resolvableExpression));
globalWritableFileInfo = {}; memset(&globalWritableFileInfo, 0, sizeof(globalWritableFileInfo));
userSettingsFileInfo = {}; memset(&userSettingsFileInfo, 0, sizeof(userSettingsFileInfo));
user = {}; memset(&user, 0, sizeof(user));
attributeID = B_PACKAGE_INFO_ENUM_COUNT; attributeID = B_PACKAGE_INFO_ENUM_COUNT;
} }