renamed set of cds functions

diff --git a/web/Obj/curl-de-sac.phh b/web/Obj/curl-de-sac.phh
index f791187..8c295bd 100644 (file)
--- a/web/Obj/curl-de-sac.phh
+++ b/web/Obj/curl-de-sac.phh
@@ -105,7 +105,7 @@ class Curl_de_sac {
         $this->dbg = $dbg;
     }
 
-    function cmd_register($cmd_cls)
+    function cmd_cls_register($cmd_cls)
     {
         if (get_class($cmd_cls) != 'CDS_cmd_cls' && is_subclass_of($cmd_cls, 'CDS_cmd_cls') == FALSE)
             return FALSE;
@@ -119,7 +119,7 @@ class Curl_de_sac {
         return TRUE;
     }
 
-    function cmd_deregister($cmd_cls)
+    function cmd_cls_deregister($cmd_cls)
     {
         if (get_class($cmd_cls) != 'CDS_cmd_cls' && is_subclass_of($cmd_cls, 'CDS_cmd_cls') == FALSE)
             return FALSE;
@@ -132,7 +132,7 @@ class Curl_de_sac {
         return TRUE;
     }
 
-    function cmd_deregister_all()
+    function cmd_cls_deregister_all()
     {
         foreach($this->cmd_cls as $cmd_cls) {
             $cmd_cls->cds_set(NULL);

diff --git a/webtest/cds_test01.php b/webtest/cds_test01.php
index 4a649ae..58d1f7c 100755 (executable)
--- a/webtest/cds_test01.php
+++ b/webtest/cds_test01.php
@@ -98,7 +98,7 @@ function main()
 
     // registrer cds_cmd 1
     printf("Register CLS1\n");
-    if (($cds->cmd_register($cmd_cls1)) == FALSE) {
+    if (($cds->cmd_cls_register($cmd_cls1)) == FALSE) {
         fprintf(STDERR, "cmd_cls1 registration failed\n");
         exit(1);
     }
@@ -108,21 +108,21 @@ function main()
 
     // register cds_cmd 2
     printf("Register CLS2\n");
-    if (($cds->cmd_register($cmd_cls2)) == FALSE) {
+    if (($cds->cmd_cls_register($cmd_cls2)) == FALSE) {
         fprintf(STDERR, "cmd_cls2 registration failed\n");
         exit(2);
     }
 
     // register cds_cmd 2 (retry)
     printf("Re-register CLS2 (must go wrong)\n");
-    if (($cds->cmd_register($cmd_cls2)) != FALSE) {
+    if (($cds->cmd_cls_register($cmd_cls2)) != FALSE) {
         fprintf(STDERR, "cmd_cls2 re-registration success\n");
         exit(3);
     }
 
     print_r($cds);
     printf("Deregister CLS2\n");
-    if (($cds->cmd_deregister($cmd_cls2)) == FALSE) {
+    if (($cds->cmd_cls_deregister($cmd_cls2)) == FALSE) {
         fprintf(STDERR, "cmd_cls2 deregistration failed\n");
         exit(4);
     }
@@ -130,24 +130,24 @@ function main()
 
     // re-re-register cds_cmd 2
     printf("Re-re-register CLS2\n");
-    if (($cds->cmd_register($cmd_cls2)) == FALSE) {
+    if (($cds->cmd_cls_register($cmd_cls2)) == FALSE) {
         fprintf(STDERR, "cmd_cls2 re-re-registration failed\n");
         exit(5);
     }
 
     printf("Deregister all\n");
-    $cds->cmd_deregister_all();
+    $cds->cmd_cls_deregister_all();
 
     // registrer cds_cmd 1
     printf("Register CLS1\n");
-    if (($cds->cmd_register($cmd_cls1)) == FALSE) {
+    if (($cds->cmd_cls_register($cmd_cls1)) == FALSE) {
         fprintf(STDERR, "cmd_cls1 registration failed\n");
         exit(1);
     }
 
     // register cds_cmd 2
     printf("Register CLS2\n");
-    if (($cds->cmd_register($cmd_cls2)) == FALSE) {
+    if (($cds->cmd_cls_register($cmd_cls2)) == FALSE) {
         fprintf(STDERR, "cmd_cls2 registration failed\n");
         exit(2);
     }