diff options
author | Bruce Momjian <bruce@momjian.us> | 2001-05-08 17:06:18 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2001-05-08 17:06:18 +0000 |
commit | 296e7ba2ba27847a152d77a41115e2f1db240779 (patch) | |
tree | 481398f1932cd3546b8cef8c76db4a163656c101 /src/interfaces/odbc/lobj.c | |
parent | 062a79a9900e7012e0eada333f209203ed433b31 (diff) | |
download | postgresql-296e7ba2ba27847a152d77a41115e2f1db240779.tar.gz postgresql-296e7ba2ba27847a152d77a41115e2f1db240779.zip |
ODBC source code cleanup patch. Should match rest of PostgreSQL code better.
Diffstat (limited to 'src/interfaces/odbc/lobj.c')
-rw-r--r-- | src/interfaces/odbc/lobj.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/src/interfaces/odbc/lobj.c b/src/interfaces/odbc/lobj.c index 1f3eb2e4d3e..4e112cd465d 100644 --- a/src/interfaces/odbc/lobj.c +++ b/src/interfaces/odbc/lobj.c @@ -1,4 +1,5 @@ -/* Module: lobj.c +/*-------- + * Module: lobj.c * * Description: This module contains routines related to manipulating * large objects. @@ -8,13 +9,14 @@ * API functions: none * * Comments: See "notice.txt" for copyright and license information. - * + *-------- */ #include "lobj.h" #include "psqlodbc.h" #include "connection.h" + Oid lo_creat(ConnectionClass *conn, int mode) { @@ -30,18 +32,16 @@ lo_creat(ConnectionClass *conn, int mode) return 0; /* invalid oid */ else return retval; - - } + int lo_open(ConnectionClass *conn, int lobjId, int mode) { int fd; int result_len; LO_ARG argv[2]; - - + argv[0].isint = 1; argv[0].len = 4; argv[0].u.integer = lobjId; @@ -59,6 +59,7 @@ lo_open(ConnectionClass *conn, int lobjId, int mode) return fd; } + int lo_close(ConnectionClass *conn, int fd) { @@ -66,17 +67,14 @@ lo_close(ConnectionClass *conn, int fd) int retval, result_len; - argv[0].isint = 1; argv[0].len = 4; argv[0].u.integer = fd; if (!CC_send_function(conn, LO_CLOSE, &retval, &result_len, 1, argv, 1)) return -1; - else return retval; - } @@ -86,7 +84,6 @@ lo_read(ConnectionClass *conn, int fd, char *buf, int len) LO_ARG argv[2]; int result_len; - argv[0].isint = 1; argv[0].len = 4; argv[0].u.integer = fd; @@ -97,11 +94,11 @@ lo_read(ConnectionClass *conn, int fd, char *buf, int len) if (!CC_send_function(conn, LO_READ, (int *) buf, &result_len, 0, argv, 2)) return -1; - else return result_len; } + int lo_write(ConnectionClass *conn, int fd, char *buf, int len) { @@ -109,7 +106,6 @@ lo_write(ConnectionClass *conn, int fd, char *buf, int len) int retval, result_len; - if (len <= 0) return 0; @@ -123,11 +119,11 @@ lo_write(ConnectionClass *conn, int fd, char *buf, int len) if (!CC_send_function(conn, LO_WRITE, &retval, &result_len, 1, argv, 2)) return -1; - else return retval; } + int lo_lseek(ConnectionClass *conn, int fd, int offset, int whence) { @@ -135,7 +131,6 @@ lo_lseek(ConnectionClass *conn, int fd, int offset, int whence) int retval, result_len; - argv[0].isint = 1; argv[0].len = 4; argv[0].u.integer = fd; @@ -150,11 +145,11 @@ lo_lseek(ConnectionClass *conn, int fd, int offset, int whence) if (!CC_send_function(conn, LO_LSEEK, &retval, &result_len, 1, argv, 3)) return -1; - else return retval; } + int lo_tell(ConnectionClass *conn, int fd) { @@ -162,18 +157,17 @@ lo_tell(ConnectionClass *conn, int fd) int retval, result_len; - argv[0].isint = 1; argv[0].len = 4; argv[0].u.integer = fd; if (!CC_send_function(conn, LO_TELL, &retval, &result_len, 1, argv, 1)) return -1; - else return retval; } + int lo_unlink(ConnectionClass *conn, Oid lobjId) { @@ -181,14 +175,12 @@ lo_unlink(ConnectionClass *conn, Oid lobjId) int retval, result_len; - argv[0].isint = 1; argv[0].len = 4; argv[0].u.integer = lobjId; if (!CC_send_function(conn, LO_UNLINK, &retval, &result_len, 1, argv, 1)) return -1; - else return retval; } |