Skip to content

Commit 29d7a1a

Browse files
CarterLiCarterLi
committed
OS (Linux): use ffStrbufSetStatic where applicatable
1 parent 8d59d14 commit 29d7a1a

File tree

1 file changed

+64
-64
lines changed

1 file changed

+64
-64
lines changed

‎src/detection/os/os_linux.c

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ FF_MAYBE_UNUSED static bool detectArmbianVersion(FFOSResult* result)
4747
// - `Armbian_Security` for images with kali repo added
4848
// - `Armbian-unofficial` for an unofficial image built from source, e.g. during development and testing
4949
if (ffStrbufStartsWithS(&result->prettyName, "Armbian"))
50-
ffStrbufSetS(&result->name, "Armbian");
50+
ffStrbufSetStatic(&result->name, "Armbian");
5151
else
5252
return false;
5353
ffStrbufSet(&result->idLike, &result->id);
@@ -69,113 +69,113 @@ FF_MAYBE_UNUSED static void getUbuntuFlavour(FFOSResult* result)
6969
return;
7070
else if(ffStrbufStartsWithS(&result->prettyName, "Linux Lite "))
7171
{
72-
ffStrbufSetS(&result->name, "Linux Lite");
73-
ffStrbufSetS(&result->id, "linuxlite");
74-
ffStrbufSetS(&result->idLike, "ubuntu");
72+
ffStrbufSetStatic(&result->name, "Linux Lite");
73+
ffStrbufSetStatic(&result->id, "linuxlite");
74+
ffStrbufSetStatic(&result->idLike, "ubuntu");
7575
ffStrbufSetS(&result->versionID, result->prettyName.chars + strlen("Linux Lite "));
7676
return;
7777
}
7878
else if(ffStrbufStartsWithS(&result->prettyName, "Rhino Linux "))
7979
{
80-
ffStrbufSetS(&result->name, "Rhino Linux");
81-
ffStrbufSetS(&result->id, "rhinolinux");
82-
ffStrbufSetS(&result->idLike, "ubuntu");
80+
ffStrbufSetStatic(&result->name, "Rhino Linux");
81+
ffStrbufSetStatic(&result->id, "rhinolinux");
82+
ffStrbufSetStatic(&result->idLike, "ubuntu");
8383
ffStrbufSetS(&result->versionID, result->prettyName.chars + strlen("Rhino Linux "));
8484
return;
8585
}
8686
else if(ffStrbufStartsWithS(&result->prettyName, "VanillaOS "))
8787
{
88-
ffStrbufSetS(&result->id, "vanilla");
89-
ffStrbufSetS(&result->idLike, "ubuntu");
88+
ffStrbufSetStatic(&result->id, "vanilla");
89+
ffStrbufSetStatic(&result->idLike, "ubuntu");
9090
}
9191

9292
if(ffStrContains(xdgConfigDirs, "kde") || ffStrContains(xdgConfigDirs, "plasma") || ffStrContains(xdgConfigDirs, "kubuntu"))
9393
{
94-
ffStrbufSetS(&result->name, "Kubuntu");
95-
ffStrbufSetS(&result->prettyName, "Kubuntu");
96-
ffStrbufSetS(&result->id, "kubuntu");
97-
ffStrbufSetS(&result->idLike, "ubuntu");
94+
ffStrbufSetStatic(&result->name, "Kubuntu");
95+
ffStrbufSetStatic(&result->prettyName, "Kubuntu");
96+
ffStrbufSetStatic(&result->id, "kubuntu");
97+
ffStrbufSetStatic(&result->idLike, "ubuntu");
9898
return;
9999
}
100100

101101
if(ffStrContains(xdgConfigDirs, "xfce") || ffStrContains(xdgConfigDirs, "xubuntu"))
102102
{
103-
ffStrbufSetS(&result->name, "Xubuntu");
104-
ffStrbufSetS(&result->prettyName, "Xubuntu");
105-
ffStrbufSetS(&result->id, "xubuntu");
106-
ffStrbufSetS(&result->idLike, "ubuntu");
103+
ffStrbufSetStatic(&result->name, "Xubuntu");
104+
ffStrbufSetStatic(&result->prettyName, "Xubuntu");
105+
ffStrbufSetStatic(&result->id, "xubuntu");
106+
ffStrbufSetStatic(&result->idLike, "ubuntu");
107107
return;
108108
}
109109

110110
if(ffStrContains(xdgConfigDirs, "lxqt") || ffStrContains(xdgConfigDirs, "lubuntu"))
111111
{
112-
ffStrbufSetS(&result->name, "Lubuntu");
113-
ffStrbufSetS(&result->prettyName, "Lubuntu");
114-
ffStrbufSetS(&result->id, "lubuntu");
115-
ffStrbufSetS(&result->idLike, "ubuntu");
112+
ffStrbufSetStatic(&result->name, "Lubuntu");
113+
ffStrbufSetStatic(&result->prettyName, "Lubuntu");
114+
ffStrbufSetStatic(&result->id, "lubuntu");
115+
ffStrbufSetStatic(&result->idLike, "ubuntu");
116116
return;
117117
}
118118

119119
if(ffStrContains(xdgConfigDirs, "budgie"))
120120
{
121-
ffStrbufSetS(&result->name, "Ubuntu Budgie");
122-
ffStrbufSetS(&result->prettyName, "Ubuntu Budgie");
123-
ffStrbufSetS(&result->id, "ubuntu-budgie");
124-
ffStrbufSetS(&result->idLike, "ubuntu");
121+
ffStrbufSetStatic(&result->name, "Ubuntu Budgie");
122+
ffStrbufSetStatic(&result->prettyName, "Ubuntu Budgie");
123+
ffStrbufSetStatic(&result->id, "ubuntu-budgie");
124+
ffStrbufSetStatic(&result->idLike, "ubuntu");
125125
return;
126126
}
127127

128128
if(ffStrContains(xdgConfigDirs, "cinnamon"))
129129
{
130-
ffStrbufSetS(&result->name, "Ubuntu Cinnamon");
131-
ffStrbufSetS(&result->prettyName, "Ubuntu Cinnamon");
132-
ffStrbufSetS(&result->id, "ubuntu-cinnamon");
133-
ffStrbufSetS(&result->idLike, "ubuntu");
130+
ffStrbufSetStatic(&result->name, "Ubuntu Cinnamon");
131+
ffStrbufSetStatic(&result->prettyName, "Ubuntu Cinnamon");
132+
ffStrbufSetStatic(&result->id, "ubuntu-cinnamon");
133+
ffStrbufSetStatic(&result->idLike, "ubuntu");
134134
return;
135135
}
136136

137137
if(ffStrContains(xdgConfigDirs, "mate"))
138138
{
139-
ffStrbufSetS(&result->name, "Ubuntu MATE");
140-
ffStrbufSetS(&result->prettyName, "Ubuntu MATE");
141-
ffStrbufSetS(&result->id, "ubuntu-mate");
142-
ffStrbufSetS(&result->idLike, "ubuntu");
139+
ffStrbufSetStatic(&result->name, "Ubuntu MATE");
140+
ffStrbufSetStatic(&result->prettyName, "Ubuntu MATE");
141+
ffStrbufSetStatic(&result->id, "ubuntu-mate");
142+
ffStrbufSetStatic(&result->idLike, "ubuntu");
143143
return;
144144
}
145145

146146
if(ffStrContains(xdgConfigDirs, "studio"))
147147
{
148-
ffStrbufSetS(&result->name, "Ubuntu Studio");
149-
ffStrbufSetS(&result->prettyName, "Ubuntu Studio");
150-
ffStrbufSetS(&result->id, "ubuntu-studio");
151-
ffStrbufSetS(&result->idLike, "ubuntu");
148+
ffStrbufSetStatic(&result->name, "Ubuntu Studio");
149+
ffStrbufSetStatic(&result->prettyName, "Ubuntu Studio");
150+
ffStrbufSetStatic(&result->id, "ubuntu-studio");
151+
ffStrbufSetStatic(&result->idLike, "ubuntu");
152152
return;
153153
}
154154

155155
if(ffStrContains(xdgConfigDirs, "sway"))
156156
{
157-
ffStrbufSetS(&result->name, "Ubuntu Sway");
158-
ffStrbufSetS(&result->prettyName, "Ubuntu Sway");
159-
ffStrbufSetS(&result->id, "ubuntu-sway");
160-
ffStrbufSetS(&result->idLike, "ubuntu");
157+
ffStrbufSetStatic(&result->name, "Ubuntu Sway");
158+
ffStrbufSetStatic(&result->prettyName, "Ubuntu Sway");
159+
ffStrbufSetStatic(&result->id, "ubuntu-sway");
160+
ffStrbufSetStatic(&result->idLike, "ubuntu");
161161
return;
162162
}
163163

164164
if(ffStrContains(xdgConfigDirs, "touch"))
165165
{
166-
ffStrbufSetS(&result->name, "Ubuntu Touch");
167-
ffStrbufSetS(&result->prettyName, "Ubuntu Touch");
168-
ffStrbufSetS(&result->id, "ubuntu-touch");
169-
ffStrbufSetS(&result->idLike, "ubuntu");
166+
ffStrbufSetStatic(&result->name, "Ubuntu Touch");
167+
ffStrbufSetStatic(&result->prettyName, "Ubuntu Touch");
168+
ffStrbufSetStatic(&result->id, "ubuntu-touch");
169+
ffStrbufSetStatic(&result->idLike, "ubuntu");
170170
return;
171171
}
172172

173173
if(ffStrContains(xdgConfigDirs, "lliurex"))
174174
{
175-
ffStrbufSetS(&result->name, "LliureX");
176-
ffStrbufSetS(&result->prettyName, "LliureX");
177-
ffStrbufSetS(&result->id, "lliurex");
178-
ffStrbufSetS(&result->idLike, "ubuntu");
175+
ffStrbufSetStatic(&result->name, "LliureX");
176+
ffStrbufSetStatic(&result->prettyName, "LliureX");
177+
ffStrbufSetStatic(&result->id, "lliurex");
178+
ffStrbufSetStatic(&result->idLike, "ubuntu");
179179
return;
180180
}
181181
}
@@ -196,8 +196,8 @@ FF_MAYBE_UNUSED static bool detectDebianDerived(FFOSResult* result)
196196
return true;
197197
else if (ffStrbufStartsWithS(&result->name, "Loc-OS"))
198198
{
199-
ffStrbufSetS(&result->id, "locos");
200-
ffStrbufSetS(&result->idLike, "debian");
199+
ffStrbufSetStatic(&result->id, "locos");
200+
ffStrbufSetStatic(&result->idLike, "debian");
201201
return true;
202202
}
203203
else if (ffStrbufEqualS(&result->name, "Parrot Security"))
@@ -210,15 +210,15 @@ FF_MAYBE_UNUSED static bool detectDebianDerived(FFOSResult* result)
210210
else if (ffStrbufStartsWithS(&result->name, "Lilidog GNU/Linux"))
211211
{
212212
// https://github.com/fastfetch-cli/fastfetch/issues/1373
213-
ffStrbufSetS(&result->id, "lilidog");
214-
ffStrbufSetS(&result->idLike, "debian");
213+
ffStrbufSetStatic(&result->id, "lilidog");
214+
ffStrbufSetStatic(&result->idLike, "debian");
215215
return true;
216216
}
217217
else if (access("/usr/bin/pveversion", X_OK) == 0)
218218
{
219-
ffStrbufSetS(&result->id, "pve");
220-
ffStrbufSetS(&result->idLike, "debian");
221-
ffStrbufSetS(&result->name, "Proxmox VE");
219+
ffStrbufSetStatic(&result->id, "pve");
220+
ffStrbufSetStatic(&result->idLike, "debian");
221+
ffStrbufSetStatic(&result->name, "Proxmox VE");
222222
ffStrbufClear(&result->versionID);
223223
if (ffProcessAppendStdOut(&result->versionID, (char* const[]) {
224224
"/usr/bin/dpkg-query",
@@ -256,15 +256,15 @@ FF_MAYBE_UNUSED static bool detectDebianDerived(FFOSResult* result)
256256
ffStrbufSetStatic(&result->name, "Raspberry Pi OS");
257257
ffStrbufSetStatic(&result->prettyName, "Raspberry Pi OS");
258258
}
259-
return true;
259+
return true;
260260
}
261261
else if (ffStrbufEndsWithS(&instance.state.platform.sysinfo.release, "+truenas"))
262262
{
263263
// TrueNAS Scale
264-
ffStrbufSetS(&result->id, "truenas-scale");
265-
ffStrbufSetS(&result->idLike, "debian");
266-
ffStrbufSetS(&result->name, "TrueNAS Scale");
267-
ffStrbufSetS(&result->prettyName, "TrueNAS Scale");
264+
ffStrbufSetStatic(&result->id, "truenas-scale");
265+
ffStrbufSetStatic(&result->idLike, "debian");
266+
ffStrbufSetStatic(&result->name, "TrueNAS Scale");
267+
ffStrbufSetStatic(&result->prettyName, "TrueNAS Scale");
268268
return true;
269269
}
270270
else
@@ -273,9 +273,9 @@ FF_MAYBE_UNUSED static bool detectDebianDerived(FFOSResult* result)
273273
FF_STRBUF_AUTO_DESTROY lsbRelease = ffStrbufCreate();
274274
if (ffAppendFileBuffer("/etc/lsb-release", &lsbRelease) && ffStrbufContainS(&lsbRelease, "DISTRIB_ID=MX"))
275275
{
276-
ffStrbufSetS(&result->id, "mx");
277-
ffStrbufSetS(&result->idLike, "debian");
278-
ffStrbufSetS(&result->name, "MX");
276+
ffStrbufSetStatic(&result->id, "mx");
277+
ffStrbufSetStatic(&result->idLike, "debian");
278+
ffStrbufSetStatic(&result->name, "MX");
279279

280280
ffStrbufClear(&result->version);
281281
ffParsePropLines(lsbRelease.chars, "DISTRIB_RELEASE=", &result->version);

0 commit comments

Comments
 (0)