[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/5] service: Improve style of 'for-each-service'.
From: |
Alex Kost |
Subject: |
[PATCH 2/5] service: Improve style of 'for-each-service'. |
Date: |
Sun, 24 Jan 2016 18:33:08 +0300 |
* modules/shepherd/service.scm (lookup-canonical-service): New procedure.
(for-each-service): Use it. Use 'hash-for-each' instead of 'hash-fold'.
---
modules/shepherd/service.scm | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/modules/shepherd/service.scm b/modules/shepherd/service.scm
index 808372c..7cf557f 100644
--- a/modules/shepherd/service.scm
+++ b/modules/shepherd/service.scm
@@ -2,6 +2,7 @@
;; Copyright (C) 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
;; Copyright (C) 2002, 2003 Wolfgang Järling <address@hidden>
;; Copyright (C) 2014 Alex Sassmannshausen <address@hidden>
+;; Copyright (C) 2016 Alex Kost <address@hidden>
;;
;; This file is part of the GNU Shepherd.
;;
@@ -810,13 +811,19 @@ given USER and/or GROUP to run COMMAND."
;;; Perform actions with services:
-;; Call PROC once for each registered service.
+(define (lookup-canonical-service name services)
+ "Return service with canonical NAME from SERVICES list.
+Return #f if service is not found."
+ (find (lambda (service)
+ (eq? name (canonical-name service)))
+ services))
+
(define (for-each-service proc)
- (hash-fold (lambda (key value unused)
- (and (eq? key (canonical-name (car value)))
- (proc (car value))))
- #f ;; Unused
- %services))
+ "Call PROC for each registered service."
+ (hash-for-each (lambda (name services)
+ (and=> (lookup-canonical-service name services)
+ proc))
+ %services))
(define (service-list)
"Return the list of services currently defined."
--
2.6.3
- [SHEPHERD] [PATCH 0/5] Replace 'dmd' service with 'root/shepherd'., Alex Kost, 2016/01/24
- [PATCH 2/5] service: Improve style of 'for-each-service'.,
Alex Kost <=
- [PATCH 3/5] service: 'service-list' returns unique services., Alex Kost, 2016/01/24
- [PATCH 4/5] service: Add docstring to 'lookup-services'., Alex Kost, 2016/01/24
- [PATCH 1/5] service: Rename 'services' variable to '%services'., Alex Kost, 2016/01/24
- [PATCH 5/5] Rename 'dmd' service to 'root'., Alex Kost, 2016/01/24
- Re: [SHEPHERD] [PATCH 0/5] Replace 'dmd' service with 'root/shepherd'., Ludovic Courtès, 2016/01/24