aboutsummaryrefslogtreecommitdiffstats
path: root/fsinfo/fsi_gram.y
diff options
context:
space:
mode:
Diffstat (limited to 'fsinfo/fsi_gram.y')
-rw-r--r--fsinfo/fsi_gram.y12
1 files changed, 4 insertions, 8 deletions
diff --git a/fsinfo/fsi_gram.y b/fsinfo/fsi_gram.y
index 961a89f1af45..85d19aa5cdab 100644
--- a/fsinfo/fsi_gram.y
+++ b/fsinfo/fsi_gram.y
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997-2006 Erez Zadok
+ * Copyright (c) 1997-2014 Erez Zadok
* Copyright (c) 1989 Jan-Simon Pendry
* Copyright (c) 1989 Imperial College of Science, Technology & Medicine
* Copyright (c) 1989 The Regents of the University of California.
@@ -16,11 +16,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 acknowledgment:
- * 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.
*
@@ -200,7 +196,7 @@ automount :
opt_auto_opts :
/* empty */
- { $$ = strdup(""); }
+ { $$ = xstrdup(""); }
| tOPTS tSTR
{ $$ = $2; }
@@ -233,7 +229,7 @@ filesystem :
{ $4->d_dev = $2; $$ = $4; }
| tFS error '}'
- { $$ = (disk_fs *) 0; }
+ { $$ = (disk_fs *) NULL; }
;
/*