From: Michael Tremer Date: Sun, 10 Jan 2021 14:59:06 +0000 (+0000) Subject: libpakfire: Drop system.c X-Git-Tag: 0.9.28~1285^2~912 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dbce253a5ebdb2075c45e8565f5ba808dc59b1e;p=pakfire.git libpakfire: Drop system.c Those functions are no longer needed and went into arch.c Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index c13603409..5797ff76f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -291,7 +291,6 @@ libpakfire_la_SOURCES = \ src/libpakfire/selector.c \ src/libpakfire/solution.c \ src/libpakfire/step.c \ - src/libpakfire/system.c \ src/libpakfire/transaction.c \ src/libpakfire/util.c @@ -319,7 +318,6 @@ pkginclude_HEADERS += \ src/libpakfire/include/pakfire/selector.h \ src/libpakfire/include/pakfire/solution.h \ src/libpakfire/include/pakfire/step.h \ - src/libpakfire/include/pakfire/system.h \ src/libpakfire/include/pakfire/transaction.h \ src/libpakfire/include/pakfire/types.h \ src/libpakfire/include/pakfire/util.h diff --git a/src/libpakfire/include/pakfire/system.h b/src/libpakfire/include/pakfire/system.h deleted file mode 100644 index d7137143e..000000000 --- a/src/libpakfire/include/pakfire/system.h +++ /dev/null @@ -1,26 +0,0 @@ -/*############################################################################# -# # -# Pakfire - The IPFire package management system # -# Copyright (C) 2017 Pakfire development team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -#############################################################################*/ - -#ifndef PAKFIRE_SYSTEM_H -#define PAKFIRE_SYSTEM_H - -const char* system_machine(); - -#endif /* PAKFIRE_SYSTEM_H */ diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c index 0b5ba63ef..07ff444d3 100644 --- a/src/libpakfire/pakfire.c +++ b/src/libpakfire/pakfire.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include diff --git a/src/libpakfire/system.c b/src/libpakfire/system.c deleted file mode 100644 index cdbc30fc0..000000000 --- a/src/libpakfire/system.c +++ /dev/null @@ -1,42 +0,0 @@ -/*############################################################################# -# # -# Pakfire - The IPFire package management system # -# Copyright (C) 2017 Pakfire development team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -#############################################################################*/ - -#include -#include - -#include -#include -#include - -const char* system_machine() { - static const char* __system_machine = NULL; - - if (!__system_machine) { - struct utsname buf; - - int r = uname(&buf); - if (r) - return NULL; - - __system_machine = pakfire_strdup(buf.machine); - } - - return __system_machine; -}