services: remove services_get() by flattening it into plugins_services()

src/etc/inc/plugins.inc

@@ -84,6 +84,10 @@ function plugins_services()
         }
     }
 
+    uasort($services, function ($a, $b) {
+        return strcasecmp($a['name'], $b['name']);
+    });
+
     return $services;
 }
 

src/etc/inc/services.inc

@@ -31,24 +31,9 @@
 
 /* XXX remove this file, merging it into system.inc */
 
-function services_get()
-{
-    $services = array();
-
-    foreach (plugins_services() as $service) {
-        $services[] = $service;
-    }
-
-    uasort($services, function ($a, $b) {
-        return strcasecmp($a['name'], $b['name']);
-    });
-
-    return $services;
-}
-
 function service_by_name($name, $filter = array())
 {
-    $services = services_get();
+    $services = plugin_services();
 
     foreach ($services as $service) {
         if ($service['name'] != $name) {

src/etc/inc/xmlrpc/service.inc

@@ -52,7 +52,7 @@ function xmlrpc_publishable_service()
  */
 function list_services_xmlrpc()
 {
-    $services = services_get();
+    $services = plugins_services();
 
     foreach ($services as &$service) {
         $service['status'] = service_status($service);

src/sbin/pluginctl

@@ -55,7 +55,7 @@ if (isset($opts['h'])) {
     // no arguments, list plugins of selected type
     $results = [];
     if (isset($opts['s'])) {
-        foreach (services_get() as $service) {
+        foreach (plugins_services() as $service) {
             $results[$service['name']] = 1;
         }
     } else {

src/www/status_services.php

@@ -50,8 +50,7 @@ if (!empty($_POST['service'])) {
     exit;
 }
 
-
-$services = services_get();
+$services = plugins_services();
 
 include("head.inc");
 

src/www/widgets/widgets/services_status.widget.php

@@ -34,7 +34,7 @@ require_once("services.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 
-$services = services_get();
+$services = plugins_services();
 
 if (isset($_POST['servicestatusfilter'])) {
     $config['widgets']['servicestatusfilter'] = htmlspecialchars($_POST['servicestatusfilter'], ENT_QUOTES | ENT_HTML401);