os: Make get_resources_*_without_inheritance() static

With that we can get rid of osinfo_os_private.h

Signed-off-by: Fabiano Fidêncio <fabiano@fidencio.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

3 files changed, 4 insertions, 47 deletions

diff --git a/osinfo/Makefile.am b/osinfo/Makefile.am
index b43e32b..cb1df8f 100644
--- a/osinfo/Makefile.am
+++ b/osinfo/Makefile.am
@@ -161,7 +161,6 @@ libosinfo_private_header_files =	\
   osinfo_product_private.h		\
   osinfo_media_private.h		\
   osinfo_resources_private.h		\
-  osinfo_os_private.h			\
   ignore-value.h			\
   $(NULL)
 
diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c
index 73ad3a3..cb28767 100644
--- a/osinfo/osinfo_os.c
+++ b/osinfo/osinfo_os.c
@@ -27,7 +27,6 @@
 #include <osinfo/osinfo.h>
 #include "osinfo_media_private.h"
 #include "osinfo/osinfo_product_private.h"
-#include "osinfo/osinfo_os_private.h"
 #include "osinfo/osinfo_resources_private.h"
 #include <glib/gi18n-lib.h>
 
@@ -853,7 +852,7 @@ osinfo_os_get_resources_internal(OsinfoOs *os,
  *
  * Returns: (transfer full): A list of resources
  */
-OsinfoResourcesList *
+static OsinfoResourcesList *
 osinfo_os_get_minimum_resources_without_inheritance(OsinfoOs *os)
 {
     g_return_val_if_fail(OSINFO_IS_OS(os), NULL);
@@ -889,7 +888,7 @@ OsinfoResourcesList *osinfo_os_get_minimum_resources(OsinfoOs *os)
  *
  * Returns: (transfer full): A list of resources
  */
-OsinfoResourcesList *
+static OsinfoResourcesList *
 osinfo_os_get_maximum_resources_without_inheritance(OsinfoOs *os)
 {
     g_return_val_if_fail(OSINFO_IS_OS(os), NULL);
@@ -926,7 +925,7 @@ OsinfoResourcesList *osinfo_os_get_maximum_resources(OsinfoOs *os)
  *
  * Returns: (transfer full): A list of resources
  */
-OsinfoResourcesList *
+static OsinfoResourcesList *
 osinfo_os_get_recommended_resources_without_inheritance(OsinfoOs *os)
 {
     g_return_val_if_fail(OSINFO_IS_OS(os), NULL);
@@ -964,7 +963,7 @@ OsinfoResourcesList *osinfo_os_get_recommended_resources(OsinfoOs *os)
  *
  * Returns: (transfer full): A list of resources
  */
-OsinfoResourcesList *
+static OsinfoResourcesList *
 osinfo_os_get_network_install_resources_without_inheritance(OsinfoOs *os)
 {
     g_return_val_if_fail(OSINFO_IS_OS(os), NULL);
diff --git a/osinfo/osinfo_os_private.h b/osinfo/osinfo_os_private.h
deleted file mode 100644
index b4df87d..0000000
--- a/osinfo/osinfo_os_private.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * libosinfo: an operating system
- *
- * Copyright (C) 2018 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Fabiano Fidêncio <fidencio@redhat.com>
- */
-
-#include <osinfo/osinfo_os.h>
-
-#ifndef __OSINFO_OS_PRIVATE_H__
-#define __OSINFO_OS_PRIVATE_H__
-
-OsinfoResourcesList *osinfo_os_get_network_install_resources_without_inheritance(OsinfoOs *os);
-OsinfoResourcesList *osinfo_os_get_minimum_resources_without_inheritance(OsinfoOs *os);
-OsinfoResourcesList *osinfo_os_get_recommended_resources_without_inheritance(OsinfoOs *os);
-OsinfoResourcesList *osinfo_os_get_maximum_resources_without_inheritance(OsinfoOs *os);
-
-#endif /* __OSINFO_OS_PRIVATE_H__ */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- * End:
- */