[librep] removed -p from file-uid/gid-p

[Christopher Bratusek <chrisb src gnome org>]

commit 79ddc940288581e3c04b0df0123f8a8ed41bb403
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Sun Jan 10 13:07:30 2010 +0100

    removed -p from file-uid/gid-p

 ChangeLog              |    8 ++++++++
 debian/librep9.symbols |    8 ++++----
 man/lang.texi          |    4 ++--
 src/files.c            |   40 ++++++++++++++++++++--------------------
 src/librep.sym         |    8 ++++----
 src/repint.h           |    4 ++--
 src/repint_subrs.h     |    4 ++--
 src/unix_files.c       |    4 ++--
 8 files changed, 44 insertions(+), 36 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9bf8f1e..79f6d81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-10  Christopher Bratusek <zanghar freenet de>
+	* src/repint.h
+	* src/repint_subrs.h
+	* src/files.c
+	* src/unix_files.c: renamed file-uid-p to file-uid and file-gid-p to file-gid
+
+	* configure.in: version bump to 0.90.6
+
 2010-01-07  Christopher Bratusek <zanghar freenet de>
 	* src/memcmp.c
 	* configure.in: cleanup for yesterdays commit
diff --git a/debian/librep9.symbols b/debian/librep9.symbols
index d5e45d7..ef9b148 100644
--- a/debian/librep9.symbols
+++ b/debian/librep9.symbols
@@ -108,8 +108,8 @@ librep.so.9 librep9 #MINVER#
  Ffile_name_nondirectory Base 0.17+svn20070119
  Ffile_nlinks Base 0.17+svn20070119
  Ffile_owner_p Base 0.17+svn20070119
- Ffile_gid_p Base 0.90.5~100104-1nano
- Ffile_uid_p Base 0.90.5~100104-1nano
+ Ffile_gid Base 0.90.5~100104-1nano
+ Ffile_uid Base 0.90.5~100104-1nano
  Ffile_readable_p Base 0.17+svn20070119
  Ffile_regular_p Base 0.17+svn20070119
  Ffile_size Base 0.17+svn20070119
@@ -440,8 +440,8 @@ librep.so.9 librep9 #MINVER#
  Qfile_name_nondirectory Base 0.17+svn20070119
  Qfile_nlinks Base 0.17+svn20070119
  Qfile_owner_p Base 0.17+svn20070119
- Qfile_gid_p Base 0.90.5~100104-1nano
- Qfile_uid_p Base 0.90.5~100104-1nano
+ Qfile_gid Base 0.90.5~100104-1nano
+ Qfile_uid Base 0.90.5~100104-1nano
  Qfile_readable_p Base 0.17+svn20070119
  Qfile_regular_p Base 0.17+svn20070119
  Qfile_size Base 0.17+svn20070119
diff --git a/man/lang.texi b/man/lang.texi
index b0e1806..d7acdbb 100644
--- a/man/lang.texi
+++ b/man/lang.texi
@@ -7390,11 +7390,11 @@ Returns true when the ownership of the file @var{file-name} is
 the same as that of any files written by the editor.
 @end defun
 
- defun file-gid-p file-name
+ defun file-gid file-name
 Returns the gid of the file @var{file-name}, as integer.
 @end defun
 
- defun file-uid-p file-name
+ defun file-uid file-name
 Returns the uid of the file @var{file-name}, as integer.
 @end defun
 
diff --git a/src/files.c b/src/files.c
index a7f2d91..ff95a2b 100644
--- a/src/files.c
+++ b/src/files.c
@@ -132,8 +132,8 @@ DEFSYM(file_regular_p, "file-regular-p");
 DEFSYM(file_directory_p, "file-directory-p");
 DEFSYM(file_symlink_p, "file-symlink-p");
 DEFSYM(file_owner_p, "file-owner-p");
-DEFSYM(file_gid_p, "file-gid-p");
-DEFSYM(file_uid_p, "file-uid-p");
+DEFSYM(file_gid, "file-gid");
+DEFSYM(file_uid, "file-uid");
 DEFSYM(file_nlinks, "file-nlinks");
 DEFSYM(file_size, "file-size");
 DEFSYM(file_modes, "file-modes");
@@ -1322,40 +1322,40 @@ same as that of any files written by the editor.
 				     Qfile_owner_p, 1, file);
 }
 
-DEFUN("file-gid-p", Ffile_gid_p, Sfile_gid_p,
+DEFUN("file-gid", Ffile_gid, Sfile_gid,
 	(repv file), rep_Subr1) /*
-::doc::rep.io.files#file-gid-p::
-file-gid-p FILE-NAME
+::doc::rep.io.files#file-gid::
+file-gid FILE-NAME
 
 Returns the gid of the file called FILE-NAME
 ::end:: */
 {
-    repv handler = rep_expand_and_get_handler(&file, op_file_gid_p);
+    repv handler = rep_expand_and_get_handler(&file, op_file_gid);
     if (!handler)
 	 return handler;
     if(rep_NILP(handler))
-	 return rep_file_gid_p(file);
+	 return rep_file_gid(file);
     else
-	 return rep_call_file_handler(handler, op_file_gid_p,
-			              Qfile_gid_p, 1, file);
+	 return rep_call_file_handler(handler, op_file_gid,
+			              Qfile_gid, 1, file);
 }
 
-DEFUN("file-uid-p", Ffile_uid_p, Sfile_uid_p,
+DEFUN("file-uid", Ffile_uid, Sfile_uid,
 	(repv file), rep_Subr1) /*
-::doc::rep.io.files#file-uid-p::
-file-uid-p FILE-NAME
+::doc::rep.io.files#file-uid::
+file-uid FILE-NAME
 
 Returns the uid of the file called FILE-NAME
 ::end:: */
 {
-    repv handler = rep_expand_and_get_handler(&file, op_file_uid_p);
+    repv handler = rep_expand_and_get_handler(&file, op_file_uid);
     if (!handler)
 	 return handler;
     if (rep_NILP(handler))
-	 return rep_file_uid_p(file);
+	 return rep_file_uid(file);
     else
-	 return rep_call_file_handler(handler, op_file_uid_p,
-			 		Qfile_uid_p, 1, file);
+	 return rep_call_file_handler(handler, op_file_uid,
+			 		Qfile_uid, 1, file);
 }
 
 DEFUN("file-nlinks", Ffile_nlinks, Sfile_nlinks,
@@ -1715,8 +1715,8 @@ rep_files_init(void)
     rep_INTERN(file_directory_p);
     rep_INTERN(file_symlink_p);
     rep_INTERN(file_owner_p);
-    rep_INTERN(file_gid_p);
-    rep_INTERN(file_uid_p);
+    rep_INTERN(file_gid);
+    rep_INTERN(file_uid);
     rep_INTERN(file_nlinks);
     rep_INTERN(file_size);
     rep_INTERN(file_modes);
@@ -1773,8 +1773,8 @@ rep_files_init(void)
     rep_ADD_SUBR(Sfile_directory_p);
     rep_ADD_SUBR(Sfile_symlink_p);
     rep_ADD_SUBR(Sfile_owner_p);
-    rep_ADD_SUBR(Sfile_gid_p);
-    rep_ADD_SUBR(Sfile_uid_p);
+    rep_ADD_SUBR(Sfile_gid);
+    rep_ADD_SUBR(Sfile_uid);
     rep_ADD_SUBR(Sfile_nlinks);
     rep_ADD_SUBR(Sfile_size);
     rep_ADD_SUBR(Sfile_modes);
diff --git a/src/librep.sym b/src/librep.sym
index 6611044..595fba9 100644
--- a/src/librep.sym
+++ b/src/librep.sym
@@ -106,8 +106,8 @@ Ffile_name_directory
 Ffile_name_nondirectory
 Ffile_nlinks
 Ffile_owner_p
-Ffile_gid_p
-Ffile_uid_p
+Ffile_gid
+Ffile_uid
 Ffile_readable_p
 Ffile_regular_p
 Ffile_size
@@ -438,8 +438,8 @@ Qfile_name_directory
 Qfile_name_nondirectory
 Qfile_nlinks
 Qfile_owner_p
-Qfile_gid_p
-Qfile_uid_p
+Qfile_gid
+Qfile_uid
 Qfile_readable_p
 Qfile_regular_p
 Qfile_size
diff --git a/src/repint.h b/src/repint.h
index 6adeaf2..2b16826 100644
--- a/src/repint.h
+++ b/src/repint.h
@@ -85,8 +85,8 @@ enum file_ops {
     op_file_directory_p,
     op_file_symlink_p,
     op_file_owner_p,
-    op_file_gid_p,
-    op_file_uid_p,
+    op_file_gid,
+    op_file_uid,
     op_file_nlinks,
     op_file_size,
     op_file_modes,
diff --git a/src/repint_subrs.h b/src/repint_subrs.h
index d7b8a8d..1cc7293 100644
--- a/src/repint_subrs.h
+++ b/src/repint_subrs.h
@@ -208,8 +208,8 @@ extern repv rep_file_regular_p(repv file);
 extern repv rep_file_directory_p(repv file);
 extern repv rep_file_symlink_p(repv file);
 extern repv rep_file_owner_p(repv file);
-extern repv rep_file_gid_p(repv file);
-extern repv rep_file_uid_p(repv file);
+extern repv rep_file_gid(repv file);
+extern repv rep_file_uid(repv file);
 extern repv rep_file_nlinks(repv file);
 extern repv rep_file_size(repv file);
 extern repv rep_file_modes(repv file);
diff --git a/src/unix_files.c b/src/unix_files.c
index 8034898..53062f3 100644
--- a/src/unix_files.c
+++ b/src/unix_files.c
@@ -432,7 +432,7 @@ rep_file_owner_p(repv file)
 }
 
 repv
-rep_file_gid_p(repv file)
+rep_file_gid(repv file)
 {
     struct stat *st = stat_file(file);
     if(st != 0)
@@ -442,7 +442,7 @@ rep_file_gid_p(repv file)
 }
 
 repv
-rep_file_uid_p(repv file)
+rep_file_uid(repv file)
 {
     struct stat *st = stat_file(file);
     if(st != 0)