From c71051037ee33e755b122f1eee89e5bfd14ad235 Mon Sep 17 00:00:00 2001 From: "Stephen R. van den Berg" <srb@cuci.nl> Date: Sun, 23 Nov 2014 03:27:47 +0100 Subject: [PATCH] Workaround c?-> bug. --- lib/modules/Sql.pmod/pgsql.pike | 6 +++--- lib/modules/Sql.pmod/pgsql_util.pmod | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/modules/Sql.pmod/pgsql.pike b/lib/modules/Sql.pmod/pgsql.pike index af1ce1487b..1c37426d9e 100644 --- a/lib/modules/Sql.pmod/pgsql.pike +++ b/lib/modules/Sql.pmod/pgsql.pike @@ -113,7 +113,7 @@ private string _sprintf(int type, void|mapping flags) { switch(type) { case 'O': res=sprintf(DRIVERNAME"(%s@%s:%d/%s,%d,%d)", - user,_host,_port,database,c?->socket?->query_fd(),backendpid); + user,_host,_port,database,c&&c->socket?->query_fd(),backendpid); break; } return res; @@ -581,11 +581,11 @@ private void preplastmessage(mapping(string:string) msgresponse) { private void waitauthready() { if(waitforauthready) { - PD("%d Wait for auth ready %O\n",c?->socket?->query_fd(),backtrace()[-2]); + PD("%d Wait for auth ready %O\n",c&&c->socket?->query_fd(),backtrace()[-2]); Thread.MutexKey lock=_shortmux->lock(); catch(waitforauthready->wait(lock)); lock=0; - PD("%d Wait for auth ready released.\n",c?->socket?->query_fd()); + PD("%d Wait for auth ready released.\n",c&&c->socket?->query_fd()); } } diff --git a/lib/modules/Sql.pmod/pgsql_util.pmod b/lib/modules/Sql.pmod/pgsql_util.pmod index 77d3be26d6..59cb824858 100644 --- a/lib/modules/Sql.pmod/pgsql_util.pmod +++ b/lib/modules/Sql.pmod/pgsql_util.pmod @@ -454,7 +454,7 @@ class sql_result { "fd: %O portalname: %O datarows: %d" " laststatus: %s\n", _state,rowsreceived,eoffound,inflight, - _query,c?->socket?->query_fd(), + _query,c&&c->socket?->query_fd(), _portalname,datarowtypes&&sizeof(datarowtypes), statuscmdcomplete||(_unnamedstatementkey?"*parsing*":"")); break; -- GitLab