From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH 1/5] service: Rename 'services' variable to '%services'. Date: Sun, 24 Jan 2016 18:33:07 +0300 Message-ID: <1453649591-3478-2-git-send-email-alezost@gmail.com> References: <1453649591-3478-1-git-send-email-alezost@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNMfW-0001Aw-Nk for guix-devel@gnu.org; Sun, 24 Jan 2016 10:33:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aNMfU-00050U-Dc for guix-devel@gnu.org; Sun, 24 Jan 2016 10:33:34 -0500 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:33241) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNMfU-00050P-5F for guix-devel@gnu.org; Sun, 24 Jan 2016 10:33:32 -0500 Received: by mail-lf0-x241.google.com with SMTP id z62so6584919lfd.0 for ; Sun, 24 Jan 2016 07:33:32 -0800 (PST) Received: from localhost.localdomain ([217.107.192.146]) by smtp.gmail.com with ESMTPSA id e130sm2135200lfe.9.2016.01.24.07.33.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Jan 2016 07:33:30 -0800 (PST) In-Reply-To: <1453649591-3478-1-git-send-email-alezost@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * modules/shepherd/service.scm (services): Rename to... (%services): ... this. (for-each-service, service-list, find-service, lookup-services, register-services, deregister-service): Adjust accordingly. --- modules/shepherd/service.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/shepherd/service.scm b/modules/shepherd/service.scm index 64d56ef..808372c 100644 --- a/modules/shepherd/service.scm +++ b/modules/shepherd/service.scm @@ -806,7 +806,7 @@ given USER and/or GROUP to run COMMAND." ;;; Registered services. ;; All registered services. -(define services (make-hash-table 75)) +(define %services (make-hash-table 75)) ;;; Perform actions with services: @@ -816,14 +816,14 @@ given USER and/or GROUP to run COMMAND." (and (eq? key (canonical-name (car value))) (proc (car value)))) #f ;; Unused - services)) + %services)) (define (service-list) "Return the list of services currently defined." (hash-fold (lambda (key services result) (append services result)) '() - services)) + %services)) (define (find-service pred) "Return the first service that matches PRED, or #f if none was found." @@ -833,13 +833,13 @@ given USER and/or GROUP to run COMMAND." (and=> (find pred services) return)) #f - services) + %services) #f))) ;; Lookup the services that provide NAME. Returns a (possibly empty) ;; list of those. (define (lookup-services name) - (hashq-ref services name '())) + (hashq-ref %services name '())) (define waitpid* (let ((waitpid (EINTR-safe waitpid))) @@ -931,7 +931,7 @@ otherwise by updating its state." (for-each (lambda (name) (let ((old (lookup-services name))) ;; Actually add the new service now. - (hashq-set! services name (cons new old)))) + (hashq-set! %services name (cons new old)))) (provided-by new))) (for-each register-single-service new-services)) @@ -953,9 +953,9 @@ requested to be removed." (let ((old (lookup-services name))) (if (= 1 (length old)) ;; Only service provides this service; remove it. - (hashq-remove! services name) + (hashq-remove! %services name) ;; ELSE: remove service from providing services. - (hashq-set! services name + (hashq-set! %services name (remove (lambda (lk-service) (eq? (canonical-name service) @@ -973,7 +973,7 @@ requested to be removed." (not (eq? key 'dmd)) (cons key service))) (_ #f))) ; all other cases: #f. - services))) + %services))) (let ((name (string->symbol service-name))) (cond ((eq? name 'all) -- 2.6.3