Another round of updates for new fmgr, mostly in the datetime code.

1 files changed, 22 insertions, 18 deletions

diff --git a/src/include/libpq/be-fsstubs.h b/src/include/libpq/be-fsstubs.h
index 63874910c52..50599e54e8c 100644
--- a/src/include/libpq/be-fsstubs.h
+++ b/src/include/libpq/be-fsstubs.h
@@ -7,39 +7,43 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: be-fsstubs.h,v 1.10 2000/01/26 05:58:12 momjian Exp $
+ * $Id: be-fsstubs.h,v 1.11 2000/06/09 01:11:12 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef BE_FSSTUBS_H
 #define BE_FSSTUBS_H
 
-/* Redefine names LOread() and LOwrite() to be lowercase to allow calling
- *	using the new v6.1 case-insensitive SQL parser. Define macros to allow
- *	the existing code to stay the same. - tgl 97/05/03
+#include "fmgr.h"
+
+/*
+ * LO functions available via pg_proc entries
  */
+extern Datum lo_import(PG_FUNCTION_ARGS);
+extern Datum lo_export(PG_FUNCTION_ARGS);
+
+extern Datum lo_creat(PG_FUNCTION_ARGS);
 
-#define LOread(f,l) loread(f,l)
-#define LOwrite(f,b) lowrite(f,b)
+extern Datum lo_open(PG_FUNCTION_ARGS);
+extern Datum lo_close(PG_FUNCTION_ARGS);
 
-extern Oid	lo_import(text *filename);
-extern int4 lo_export(Oid lobjId, text *filename);
+extern Datum loread(PG_FUNCTION_ARGS);
+extern Datum lowrite(PG_FUNCTION_ARGS);
 
-extern Oid	lo_creat(int mode);
+extern Datum lo_lseek(PG_FUNCTION_ARGS);
+extern Datum lo_tell(PG_FUNCTION_ARGS);
+extern Datum lo_unlink(PG_FUNCTION_ARGS);
 
-extern int	lo_open(Oid lobjId, int mode);
-extern int	lo_close(int fd);
+/*
+ * These are not fmgr-callable, but are available to C code.
+ * Probably these should have had the underscore-free names,
+ * but too late now...
+ */
 extern int	lo_read(int fd, char *buf, int len);
 extern int	lo_write(int fd, char *buf, int len);
-extern int	lo_lseek(int fd, int offset, int whence);
-extern int	lo_tell(int fd);
-extern int	lo_unlink(Oid lobjId);
-
-extern struct varlena *loread(int fd, int len);
-extern int	lowrite(int fd, struct varlena * wbuf);
 
 /*
- * Added for buffer leak prevention [ Pascal André <andre@via.ecp.fr> ]
+ * Cleanup LOs at xact commit/abort [ Pascal André <andre@via.ecp.fr> ]
  */
 extern void lo_commit(bool isCommit);