BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / window / var.h

diff --git a/usr/src/usr.bin/window/var.h b/usr/src/usr.bin/window/var.h
index 48b8cdc..54bc241 100644 (file)
--- a/usr/src/usr.bin/window/var.h
+++ b/usr/src/usr.bin/window/var.h
@@ -1,5 +1,39 @@
 /*
 /*

- *     @(#)var.h       3.3 84/01/12
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Edward Wang at The University of California, Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University 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 OR 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.
+ *
+ *     @(#)var.h       3.11 (Berkeley) 6/6/90

  */
 
 struct var {
  */
 
 struct var {


@@ -9,12 +43,16 @@ struct var {
        struct value r_val;
 };
 
        struct value r_val;
 };
 

-struct var *var_set();
-struct var *var_setstr();
-struct var *var_setnum();
+struct var *var_set1();
+struct var *var_setstr1();
+struct var *var_setnum1();

 struct var **var_lookup1();
 
 struct var **var_lookup1();
 

-#define var_walk(f)    var_walk1(var_head, (f))
-#define var_lookup(n)  (*var_lookup1(n))
+#define var_set(n, v)          var_set1(&var_head, n, v)
+#define var_setstr(n, s)       var_setstr1(&var_head, n, s)
+#define var_setnum(n, i)       var_setnum1(&var_head, n, i)
+#define var_unset(n)           var_unset1(&var_head, n)
+#define var_lookup(n)          (*var_lookup1(&var_head, n))
+#define var_walk(f, a)         var_walk1(var_head, f, a)

 
 struct var *var_head;          /* secret, shhh */
 
 struct var *var_head;          /* secret, shhh */