freshen to upstream CVS head

[debian/pax] / sel_subs.h

diff --git a/sel_subs.h b/sel_subs.h
index fc86e9dfa236362632865f01dd647186ce7c027a..b699ee83ef353f35de8ce769f6601b566f12652e 100644 (file)
--- a/sel_subs.h
+++ b/sel_subs.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sel_subs.h,v 1.2 1996/06/23 14:20:41 deraadt Exp $    */
+/*     $OpenBSD: sel_subs.h,v 1.4 2003/06/02 23:32:09 millert Exp $    */
 /*     $NetBSD: sel_subs.h,v 1.3 1995/03/21 09:07:44 cgd Exp $ */
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -61,7 +57,7 @@ typedef struct grpt {
  * data structure for storing user supplied time ranges (-T option)
  */
 
-#define ATOI2(s)       ((((s)[0] - '0') * 10) + ((s)[1] - '0'))
+#define ATOI2(ar)      ((ar)[0] - '0') * 10 + ((ar)[1] - '0'); (ar) += 2;
 
 typedef struct time_rng {
        time_t          low_time;       /* lower inclusive time limit */