mirror of
https://github.com/fastfetch-cli/fastfetch.git
synced 2026-09-13 02:42:09 +02:00
OS (Haiku): Fix warnings
This commit is contained in:
committed by
Carter Li
parent
576548b15e
commit
a63d854681
@@ -1,6 +1,7 @@
|
||||
#include "os.h"
|
||||
#include <OS.h>
|
||||
#include <image.h>
|
||||
#include <SupportDefs.h>
|
||||
|
||||
void ffDetectOSImpl(FFOSResult* os) {
|
||||
ffStrbufSetStatic(&os->name, "Haiku");
|
||||
@@ -32,7 +33,7 @@ void ffDetectOSImpl(FFOSResult* os) {
|
||||
int32 relVer = ver / 0x10000;
|
||||
ver %= 0x10000;
|
||||
if (ver == 0) {
|
||||
ffStrbufSetF(&os->version, "R%d", relVer);
|
||||
ffStrbufSetF(&os->version, "R%" B_PRId32, relVer);
|
||||
} else {
|
||||
relVer++;
|
||||
|
||||
@@ -40,16 +41,16 @@ void ffDetectOSImpl(FFOSResult* os) {
|
||||
if (ver < B_HAIKU_VERSION_1_PRE_BETA_1) {
|
||||
int32 alphaVer = ver / 0x100;
|
||||
if (isPre) {
|
||||
ffStrbufSetF(&os->version, "R%dA%d-", relVer, alphaVer + 1);
|
||||
ffStrbufSetF(&os->version, "R%" B_PRId32 "A%ld-", relVer, alphaVer + 1);
|
||||
} else {
|
||||
ffStrbufSetF(&os->version, "R%dA%d", relVer, alphaVer);
|
||||
ffStrbufSetF(&os->version, "R%" B_PRId32 "A%ld", relVer, alphaVer);
|
||||
}
|
||||
} else if (ver < 0x00010000 /* B_HAIKU_VERSION_1 */) {
|
||||
int32 betaVer = (ver - B_HAIKU_VERSION_1_ALPHA_4) / 0x100;
|
||||
if (isPre) {
|
||||
ffStrbufSetF(&os->version, "R%dB%d-", relVer, betaVer + 1);
|
||||
ffStrbufSetF(&os->version, "R%" B_PRId32 "B%ld-", relVer, betaVer + 1);
|
||||
} else {
|
||||
ffStrbufSetF(&os->version, "R%dB%d", relVer, betaVer);
|
||||
ffStrbufSetF(&os->version, "R%" B_PRId32 "B%ld", relVer, betaVer);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -59,7 +60,7 @@ void ffDetectOSImpl(FFOSResult* os) {
|
||||
if (!os->version.length) {
|
||||
system_info sys;
|
||||
if (get_system_info(&sys) == B_OK) {
|
||||
ffStrbufAppendF(&os->version, "R%ldx", sys.kernel_version);
|
||||
ffStrbufAppendF(&os->version, "R%" B_PRIx64, sys.kernel_version);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user