standardize copyright

[protos/libecoli.git] / lib / ecoli_node.c

diff --git a/lib/ecoli_node.c b/lib/ecoli_node.c
index f8c6c02..2b667a6 100644 (file)
--- a/lib/ecoli_node.c
+++ b/lib/ecoli_node.c
@@ -1,28 +1,5 @@
-/*
- * Copyright (c) 2016, Olivier MATZ <zer0@droids-corp.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the University of California, Berkeley nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2016, Olivier MATZ <zer0@droids-corp.org>
  */
 
 #include <stdio.h>
@@ -259,34 +236,25 @@ const char *ec_node_id(const struct ec_node *node)
 static void __ec_node_dump(FILE *out,
        const struct ec_node *node, size_t indent)
 {
-       const char *id, *typename, *desc;
+       const char *id, *typename;
        struct ec_node *child;
        size_t i, n;
 
        id = ec_node_id(node);
        typename = node->type->name;
-       desc = ec_node_desc(node);
-
-       /* XXX enhance */
-       for (i = 0; i < indent; i++) {
-               if (i % 2)
-                       fprintf(out, " ");
-               else
-                       fprintf(out, "|");
-       }
 
-       fprintf(out, "node %p type=%s id=%s desc=%s ",
-               node, typename, id, desc);
+       fprintf(out, "%*s" "type=%s id=%s %p\n",
+               (int)indent * 4, "", typename, id, node);
        n = node->n_children;
        for (i = 0; i < n; i++) {
                child = node->children[i];
-               __ec_node_dump(out, child, indent + 2);
+               __ec_node_dump(out, child, indent + 1);
        }
 }
 
 void ec_node_dump(FILE *out, const struct ec_node *node)
 {
-       fprintf(out, "------------------- node dump:\n"); //XXX
+       fprintf(out, "------------------- node dump:\n");
 
        if (node == NULL) {
                fprintf(out, "node is NULL\n");