r11859: Canonicalize whitespace

[clsql.git] / db-odbc / odbc-ff-interface.lisp

diff --git a/db-odbc/odbc-ff-interface.lisp b/db-odbc/odbc-ff-interface.lisp
index 7b780233db545f6a9abbe95054e7cd25fa00b43a..2ae944d76a8b41f947e8bc7f0f21fc2d6c3fc853 100644 (file)
--- a/db-odbc/odbc-ff-interface.lisp
+++ b/db-odbc/odbc-ff-interface.lisp
@@ -19,9 +19,9 @@
 (in-package #:odbc)
 
 (def-foreign-type sql-handle :pointer-void)
-(def-foreign-type sql-handle-ptr '(* sql-handle))
-(def-foreign-type string-ptr '(* :unsigned-char))
-(def-type long-ptr-type '(* #.$ODBC-LONG-TYPE))
+(def-foreign-type sql-handle-ptr (* sql-handle))
+(def-foreign-type string-ptr (* :unsigned-char))
+(def-type long-ptr-type (* #.$ODBC-LONG-TYPE))
 
 ;; odbc v3
 (def-function "SQLAllocHandle"
@@ -38,6 +38,7 @@
   :module "odbc"
   :returning :short)              ; RETCODE_SQL_API
 
+;; deprecated
 (def-function "SQLAllocConnect"
     ((henv sql-handle)          ; HENV        henv
      (*phdbc sql-handle-ptr)    ; HDBC   FAR *phdbc
@@ -49,7 +50,7 @@
     ((hdbc sql-handle)          ; HDBC        hdbc
      (*szDSN :cstring)        ; UCHAR  FAR *szDSN
      (cbDSN :short)             ; SWORD       cbDSN
-     (*szUID :cstring)        ; UCHAR  FAR *szUID 
+     (*szUID :cstring)        ; UCHAR  FAR *szUID
      (cbUID :short)             ; SWORD       cbUID
      (*szAuthStr :cstring)    ; UCHAR  FAR *szAuthStr
      (cbAuthStr :short)         ; SWORD       cbAuthStr
@@ -60,7 +61,7 @@
 (def-function "SQLDriverConnect"
     ((hdbc sql-handle)          ; HDBC        hdbc
      (hwnd sql-handle)          ; SQLHWND     hwnd
-     (*szConnStrIn string-ptr)  ; UCHAR  FAR *szConnStrIn
+     (*szConnStrIn :cstring)    ; UCHAR  FAR *szConnStrIn
      (cbConnStrIn :short)       ; SWORD       cbConnStrIn
      (*szConnStrOut string-ptr) ; UCHAR  FAR *szConnStrOut
      (cbConnStrOutMax :short)   ; SWORD       cbConnStrOutMax
@@ -74,7 +75,8 @@
     ((hdbc sql-handle))         ; HDBC        hdbc
   :module "odbc"
   :returning :short)              ; RETCODE_SQL_API
-  
+
+;; deprecated
 (def-function "SQLAllocStmt"
     ((hdbc sql-handle)          ; HDBC        hdbc
      (*phstmt sql-handle-ptr)   ; HSTMT  FAR *phstmt
@@ -298,7 +300,7 @@
   :module "odbc"
   :returning :short)              ; RETCODE_SQL_API
 
-                                       ; level 2
+                                        ; level 2
 (def-function "SQLExtendedFetch"
     ((hstmt sql-handle)         ; HSTMT       hstmt
      (fFetchType :short)        ; UWORD       fFetchType
@@ -331,11 +333,11 @@
 
 ;;; foreign type definitions
 
-;;(defmacro %sql-len-data-at-exec (length) 
+;;(defmacro %sql-len-data-at-exec (length)
 ;;  `(- $SQL_LEN_DATA_AT_EXEC_OFFSET ,length))
 
 
-(def-struct sql-c-time 
+(def-struct sql-c-time
     (hour   :short)
   (minute :short)
   (second :short))
@@ -344,7 +346,7 @@
     (year  :short)
   (month :short)
   (day   :short))
-  
+
 (def-struct sql-c-timestamp
     (year     :short)
   (month    :short)
@@ -383,6 +385,7 @@
      (table-name-length :short)
      (table-type-name :pointer-void)
      (table-type-name-length :short))
+  :module "odbc"
   :returning :short)
 
 
@@ -396,6 +399,7 @@
      (table-name-length :short)
      (unique :short)
      (reserved :short))
+  :module "odbc"
   :returning :short)