← Back to branch summary

~ubuntu-branches/ubuntu/maverick/myodbc/maverick

« back to all changes in this revision

Viewing changes to util/MYODBCUtilReadDataSourceStr.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2009-05-10 03:07:47 UTC
  • mfrom: (8.1.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090510030747-pvy1kyun4743gws8
Tags: 3.51.19r646-1
http://bugs.debian.org/521185
* New upstream release
  - fix build failure with current libmysqlclient.  Closes: #521185.
* Fix lintian warnings about ignoring errors in postinst, config scripts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
util/MYODBCUtilReadDataSourceStr.c
257
257
                            if ( !pDataSource->pszUSER )
258
258
                                pDataSource->pszUSER = (char *)_global_strndup( pAnchorChar, pScanChar - pAnchorChar );
259
259
                        }
 
260
                        else if ( strcasecmp( pszName, "SSLCA" ) == 0 )
 
261
                        {
 
262
                            if ( !pDataSource->pszSSLCA )
 
263
                                pDataSource->pszSSLCA = (char *)_global_strndup( pAnchorChar, pScanChar - pAnchorChar );
 
264
                        }
 
265
                        else if ( strcasecmp( pszName, "SSLCAPATH" ) == 0 )
 
266
                        {
 
267
                            if ( !pDataSource->pszSSLCAPATH )
 
268
                                pDataSource->pszSSLCAPATH = (char *)_global_strndup( pAnchorChar, pScanChar - pAnchorChar );
 
269
                        }
 
270
                        else if ( strcasecmp( pszName, "SSLCERT" ) == 0 )
 
271
                        {
 
272
                            if ( !pDataSource->pszSSLCERT )
 
273
                                pDataSource->pszSSLCERT = (char *)_global_strndup( pAnchorChar, pScanChar - pAnchorChar );
 
274
                        }
 
275
                        else if ( strcasecmp( pszName, "SSLCIPHER" ) == 0 )
 
276
                        {
 
277
                            if ( !pDataSource->pszSSLCIPHER )
 
278
                                pDataSource->pszSSLCIPHER = (char *)_global_strndup( pAnchorChar, pScanChar - pAnchorChar );
 
279
                        }
 
280
                        else if ( strcasecmp( pszName, "SSLKEY" ) == 0 )
 
281
                        {
 
282
                            if ( !pDataSource->pszSSLKEY )
 
283
                                pDataSource->pszSSLKEY = (char *)_global_strndup( pAnchorChar, pScanChar - pAnchorChar );
 
284
                        }
 
285
                        else if (strcasecmp(pszName, "CHARSET") == 0)
 
286
                        {
 
287
                          if (!pDataSource->pszCHARSET)
 
288
                              pDataSource->pszCHARSET=
 
289
                                (char *)_global_strndup(pAnchorChar,
 
290
                                                        pScanChar -
 
291
                                                        pAnchorChar);
 
292
                        }
260
293
                        else
261
294
                        {
262
295
                            fprintf( stderr, "[%s][%d][ERROR] Unhandled attribute (%s).\n", __FILE__, __LINE__, pszName );
263
296
                        }
264
297
 
265
298
                        if ( pszName )
266
 
                            free( pszName );
 
299
                            _global_free( pszName );
267
300
                        pszName = 0;
268
301
                    }
269
302
                }
286
319
    } /* while scan */
287
320
 
288
321
    if ( pszName )
289
 
        free( pszName );
 
322
        _global_free( pszName );
290
323
 
291
324
    return TRUE;
292
325
}