Overview
| Comment: | OFSystemInfo: Minor #ifdef cleanup |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
feed7bc7f999889a85dca92ea4ad47c8 |
| User & Date: | js on 2017-02-04 13:13:14 |
| Other Links: | manifest | tags |
Context
|
2017-02-04
| ||
| 15:28 | Minor documentation improvements check-in: 6328d96718 user: js tags: trunk | |
| 13:13 | OFSystemInfo: Minor #ifdef cleanup check-in: feed7bc7f9 user: js tags: trunk | |
|
2017-02-03
| ||
| 22:42 | Improve -[OFObject hash] check-in: a55371e2c9 user: js tags: trunk | |
Changes
Modified src/OFSystemInfo.m from [eb4890cccd] to [2c3ef6bc2d].
| ︙ | ︙ | |||
204 205 206 207 208 209 210 | if (find_directory(B_USER_SETTINGS_DIRECTORY, 0, false, pathC, PATH_MAX) != B_OK) @throw [OFNotImplementedException exceptionWithSelector: _cmd object: self]; return [OFString stringWithUTF8String: pathC]; | | | 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 |
if (find_directory(B_USER_SETTINGS_DIRECTORY, 0, false,
pathC, PATH_MAX) != B_OK)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
return [OFString stringWithUTF8String: pathC];
#elif
void *pool = objc_autoreleasePoolPush();
OFDictionary *env = [OFApplication environment];
OFString *var;
if ((var = [env objectForKey: @"XDG_DATA_HOME"]) != nil &&
[var length] > 0) {
[var retain];
|
| ︙ | ︙ | |||
226 227 228 229 230 231 232 | var = [OFString pathWithComponents: [OFArray arrayWithObjects: var, @".local", @"share", nil]]; [var retain]; objc_autoreleasePoolPop(pool); return [var autorelease]; | < < < | 226 227 228 229 230 231 232 233 234 235 236 237 238 239 |
var = [OFString pathWithComponents: [OFArray arrayWithObjects:
var, @".local", @"share", nil]];
[var retain];
objc_autoreleasePoolPop(pool);
return [var autorelease];
#endif
}
+ (OFString*)userConfigPath
{
#if defined(OF_MAC_OS_X) || defined(OF_IOS)
void *pool = objc_autoreleasePoolPush();
|
| ︙ | ︙ | |||
299 300 301 302 303 304 305 | if (find_directory(B_USER_SETTINGS_DIRECTORY, 0, false, pathC, PATH_MAX) != B_OK) @throw [OFNotImplementedException exceptionWithSelector: _cmd object: self]; return [OFString stringWithUTF8String: pathC]; | | < < < | 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 |
if (find_directory(B_USER_SETTINGS_DIRECTORY, 0, false,
pathC, PATH_MAX) != B_OK)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
return [OFString stringWithUTF8String: pathC];
#else
void *pool = objc_autoreleasePoolPush();
OFDictionary *env = [OFApplication environment];
OFString *var;
if ((var = [env objectForKey: @"XDG_CONFIG_HOME"]) != nil &&
[var length] > 0) {
[var retain];
objc_autoreleasePoolPop(pool);
return [var autorelease];
}
if ((var = [env objectForKey: @"HOME"]) == nil)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
var = [var stringByAppendingPathComponent: @".config"];
[var retain];
objc_autoreleasePoolPop(pool);
return [var autorelease];
#endif
}
+ (OFString*)CPUVendor
{
#if defined(OF_X86_64_ASM) || defined(OF_X86_ASM)
struct x86_regs regs = x86_cpuid(0, 0);
|
| ︙ | ︙ |