From 13f972ec022a49eb2473fc180c5b620111dbda0c Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Sun, 4 Nov 2007 19:36:58 +0000 Subject: [PATCH] Monotone-Parent: 1865c323d7ad50eb8c6c85593589a30d6ba12616 Monotone-Revision: ccbed15b6f37f75e0bbfa953398b17360efc17dc Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-11-04T19:36:58 Monotone-Branch: ca.inverse.sogo --- SOPE/sope-patchset-r1546.diff | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/SOPE/sope-patchset-r1546.diff b/SOPE/sope-patchset-r1546.diff index e6f185e18..0d7984901 100644 --- a/SOPE/sope-patchset-r1546.diff +++ b/SOPE/sope-patchset-r1546.diff @@ -97,7 +97,7 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m + free(info->value); + info->value = NULL; + } -+ free(info); ++ free(info); + [_row_buffer removeObjectAtIndex: c]; } @@ -144,7 +144,7 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m + + OCIHandleFree(_oci_ctx, OCI_HTYPE_SVCCTX); + OCIHandleFree(_oci_err, OCI_HTYPE_ERROR); -+ OCIHandleFree(_oci_env, OCI_HTYPE_ENV); ++ // OCIHandleFree(_oci_env, OCI_HTYPE_ENV); + + _oci_ctx = (OCISvcCtx *)0; + _oci_err = (OCIError *)0; @@ -164,7 +164,7 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m RELEASE(delegate); [super dealloc]; -@@ -368,15 +394,6 @@ +@@ -368,16 +394,7 @@ return NO; } @@ -177,9 +177,11 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m - NSLog(@"FAILED: OCIInitialize()"); - return NO; - } - +- ++ if (OCIEnvInit((OCIEnv **)&_oci_env, (ub4)OCI_DEFAULT, (size_t)0, (dvoid **)0)) { + NSLog(@"FAILED: OCIEnvInit()"); Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m =================================================================== --- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (révision 1546)