Changeset 1189:9e227c53a1a5
- Timestamp:
- 03/23/09 08:45:20 (3 years ago)
- Branch:
- default
- Location:
- trunk
- Files:
-
- 35 edited
- 1 moved
-
include/libdodo/cgiFastExchange.h (modified) (3 diffs)
-
include/libdodo/dataBaseMysql.h (modified) (2 diffs)
-
include/libdodo/dataBasePostgresql.h (modified) (2 diffs)
-
include/libdodo/dataBaseSqlite.h (modified) (2 diffs)
-
include/libdodo/dataFormatXmlNode.h (modified) (2 diffs)
-
include/libdodo/dataFormatXmlProcessor.h (modified) (11 diffs)
-
include/libdodo/dataMemoryShared.h (modified) (2 diffs)
-
include/libdodo/graphicsImage.h (modified) (2 diffs)
-
include/libdodo/ioNetworkSslClient.h (modified) (2 diffs)
-
include/libdodo/ioNetworkSslExchange.h (modified) (4 diffs)
-
include/libdodo/ioPipe.h (modified) (1 diff)
-
include/libdodo/ioSsl.h (modified) (1 diff)
-
include/libdodo/pcSyncProcessDataSingle.h (modified) (2 diffs)
-
include/libdodo/pcSyncProcessSection.h (modified) (2 diffs)
-
src/cgiFastExchange.cc (modified) (2 diffs)
-
src/cgiFastRequest.inline (modified) (1 diff)
-
src/cgiFastServer.cc (modified) (2 diffs)
-
src/dataBaseMysql.cc (modified) (3 diffs)
-
src/dataBasePostgresql.cc (modified) (3 diffs)
-
src/dataBaseSqlite.cc (modified) (3 diffs)
-
src/dataFormatXmlProcessor.cc (modified) (25 diffs)
-
src/dataMemoryShared.cc (modified) (3 diffs)
-
src/graphicsDraw.cc (modified) (8 diffs)
-
src/graphicsImage.cc (modified) (20 diffs)
-
src/graphicsImage.inline (modified) (1 diff)
-
src/graphicsTransform.cc (modified) (8 diffs)
-
src/ioNetworkSslClient.cc (modified) (1 diff)
-
src/ioNetworkSslExchange.cc (modified) (6 diffs)
-
src/ioPipe.cc (modified) (37 diffs)
-
src/ioSsl.inline (modified) (1 diff)
-
src/ioStdio.cc (modified) (2 diffs)
-
src/pcSyncProcessDataSingle.cc (modified) (3 diffs)
-
src/pcSyncProcessLock.inline (moved) (moved from trunk/src/pcSyncProcessSemaphore.inline) (2 diffs)
-
src/pcSyncProcessSection.cc (modified) (3 diffs)
-
src/rpcXmlClient.cc (modified) (1 diff)
-
src/rpcXmlServer.cc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/libdodo/cgiFastExchange.h
r1188 r1189 43 43 namespace fast 44 44 { 45 struct __request Handle;45 struct __request; 46 46 47 47 /** … … 66 66 * @param protection defines type of IO protection[see channelProtectionTypeEnum] 67 67 */ 68 exchange(const __request Handle&req,68 exchange(const __request &req, 69 69 short protection = io::CHANNEL_PROTECTION_PROCESS); 70 70 … … 126 126 private: 127 127 128 __request Handle*request; ///< fast CGI descriptor128 __request *request; ///< fast CGI descriptor 129 129 }; 130 130 }; -
trunk/include/libdodo/dataBaseMysql.h
r1188 r1189 43 43 namespace base 44 44 { 45 struct __mysql Handle;45 struct __mysql; 46 46 47 47 /** … … 182 182 bool empty; ///< true id mysqlRes is empty 183 183 184 __mysql Handle*handle; ///< DB handle184 __mysql *handle; ///< DB handle 185 185 186 186 unsigned long type; ///< connection type -
trunk/include/libdodo/dataBasePostgresql.h
r1188 r1189 43 43 namespace base 44 44 { 45 struct __postgresql Handle;45 struct __postgresql; 46 46 47 47 /** … … 234 234 bool empty; ///< true id pgResult is empty 235 235 236 __postgresql Handle*handle; ///< DB handle236 __postgresql *handle; ///< DB handle 237 237 }; 238 238 }; -
trunk/include/libdodo/dataBaseSqlite.h
r1188 r1189 43 43 namespace base 44 44 { 45 struct __sqlite Handle;45 struct __sqlite; 46 46 47 47 /** … … 163 163 private: 164 164 165 __sqlite Handle*handle; ///< DB handle165 __sqlite *handle; ///< DB handle 166 166 167 167 bool empty; ///< true if liteStmt is empty -
trunk/include/libdodo/dataFormatXmlNode.h
r1188 r1189 56 56 57 57 /** 58 * @struct __node HandleNamespace58 * @struct __nodeNamespace 59 59 * @brief defines node namespace 60 60 */ 61 struct __node HandleNamespace61 struct __nodeNamespace 62 62 { 63 63 dodoString prefix; ///< prefix for the namespace … … 145 145 dodoString name; ///< name of the node [[tag]] 146 146 147 __node HandleNamespace ns; ///< namespace of the node148 __node HandleNamespace nsDef; ///< namespace definition of the node147 __nodeNamespace ns; ///< namespace of the node 148 __nodeNamespace nsDef; ///< namespace definition of the node 149 149 150 150 protected: -
trunk/include/libdodo/dataFormatXmlProcessor.h
r1188 r1189 45 45 class node; 46 46 47 struct __node Handle;48 49 struct __doc Handle;47 struct __node; 48 49 struct __doc; 50 50 51 51 /** 52 * @struct __node HandleDef52 * @struct __nodeDef 53 53 * @brief defines processor tree definition 54 54 */ 55 struct __node HandleDef55 struct __nodeDef 56 56 { 57 57 /** 58 58 * constructor 59 59 */ 60 __node HandleDef();60 __nodeDef(); 61 61 62 62 /** … … 64 64 * @param ns defines namespace of the node 65 65 */ 66 __node HandleDef(const dodoString &name,66 __nodeDef(const dodoString &name, 67 67 const dodoString &ns = __dodostring__); 68 68 69 69 dodoString name; ///< name of the node [[tag]]; if empty - for first - gets root, for children - all[but if children do not have in definition own children] 70 70 71 dodoMap<dodoString, __node HandleDef> children; ///< children definitions71 dodoMap<dodoString, __nodeDef> children; ///< children definitions 72 72 bool allChildren; ///< if true - get all children tree[true by default] 73 73 … … 132 132 133 133 /** 134 * parse XML file using __node HandleDef XML definition134 * parse XML file using __nodeDef XML definition 135 135 * @return parsed XML in node structure 136 136 * @param definition defines structure of XML 137 137 * @param file defines path to XML file 138 138 */ 139 virtual node processFile(const __node HandleDef &definition,139 virtual node processFile(const __nodeDef &definition, 140 140 const dodoString &file); 141 141 142 142 /** 143 * parse XML buffer using __node HandleDef XML definition143 * parse XML buffer using __nodeDef XML definition 144 144 * @return parsed XML in node structure 145 145 * @param definition defines structure of XML 146 146 * @param buffer defines XML buffer 147 147 */ 148 virtual node processString(const __node HandleDef &definition,148 virtual node processString(const __nodeDef &definition, 149 149 const dodoString &buffer); 150 150 … … 187 187 * @param xnode defines node definition to clean 188 188 */ 189 static void initNodeDef(__node HandleDef &xnode);189 static void initNodeDef(__nodeDef &xnode); 190 190 191 191 /** … … 213 213 214 214 /** 215 * parse XML using __node HandleDef XML definition216 * @return parsed XML in node structure 217 * @param definition defines structure of XML 218 */ 219 virtual node parse(const __node HandleDef &definition);215 * parse XML using __nodeDef XML definition 216 * @return parsed XML in node structure 217 * @param definition defines structure of XML 218 */ 219 virtual node parse(const __nodeDef &definition); 220 220 221 221 #ifdef LIBXML2_EXT … … 224 224 * @param xnode defines XML tree node 225 225 */ 226 bool isCDATA(const __node Handle&xnode);226 bool isCDATA(const __node &xnode); 227 227 228 228 /** … … 231 231 * @param xnode defines XML tree node 232 232 */ 233 virtual dodoArray<node> parse(__node Handlexnode);234 235 /** 236 * parses XML using __node HandleDef XML definition233 virtual dodoArray<node> parse(__node xnode); 234 235 /** 236 * parses XML using __nodeDef XML definition 237 237 * @return parsed XML nodes in node structures 238 238 * @param definition defines structure of XML 239 239 * @param chNode defines XML tree node 240 240 */ 241 virtual dodoArray<node> parse(const __node HandleDef &definition,242 const __node Handle&xnode);241 virtual dodoArray<node> parse(const __nodeDef &definition, 242 const __node &xnode); 243 243 244 244 /** … … 247 247 * @param attributes defines buffer for attributes 248 248 */ 249 virtual void getAttributes(const __node Handle&xnode,249 virtual void getAttributes(const __node &xnode, 250 250 dodoStringMap &attributes); 251 251 … … 256 256 * @param attributes defines buffer for attributes 257 257 */ 258 virtual void getAttributes(const __node HandleDef &definition,259 const __node Handle&xnode,258 virtual void getAttributes(const __nodeDef &definition, 259 const __node &xnode, 260 260 dodoStringMap &attributes); 261 261 … … 265 265 * @param sample defines buffer for node 266 266 */ 267 virtual void getNodeInfo(const __node Handle&xnode,267 virtual void getNodeInfo(const __node &xnode, 268 268 node &sample); 269 269 #endif … … 286 286 * @param node defines node content 287 287 */ 288 __node Handle findNode(const __nodeHandleDef &definition,289 const __node Handle&node);290 291 __doc Handle*document; ///< XML Document288 __node findNode(const __nodeDef &definition, 289 const __node &node); 290 291 __doc *document; ///< XML Document 292 292 #endif 293 293 -
trunk/include/libdodo/dataMemoryShared.h
r1188 r1189 39 39 namespace memory 40 40 { 41 struct __key Handle;41 struct __key; 42 42 43 43 /** … … 131 131 #endif 132 132 133 __key Handle*key; ///< key for the shared data133 __key *key; ///< key for the shared data 134 134 135 135 bool autogenerated; ///< true if key was autogenerated -
trunk/include/libdodo/graphicsImage.h
r1188 r1189 42 42 namespace graphics 43 43 { 44 struct __image Handle;44 struct __image; 45 45 46 46 /** … … 85 85 ~__xexecImageCollectedData(); 86 86 87 __image Handle*handle; ///< ImageMagic handle87 __image *handle; ///< ImageMagic handle 88 88 }; 89 89 -
trunk/include/libdodo/ioNetworkSslClient.h
r1185 r1189 48 48 namespace ssl 49 49 { 50 struct __ssl Handle;50 struct __sslConnection; 51 51 struct __sslContext; 52 52 struct __certificates; … … 144 144 virtual void connectSsl(); 145 145 146 io::ssl::__ssl Handle*handle; ///< ssl connection handle146 io::ssl::__sslConnection *handle; ///< ssl connection handle 147 147 io::ssl::__sslContext *ctx; ///< ssl connection context 148 148 -
trunk/include/libdodo/ioNetworkSslExchange.h
r1185 r1189 47 47 namespace ssl 48 48 { 49 struct __ssl Handle;49 struct __sslConnection; 50 50 51 51 /** … … 81 81 int socket; ///< socket 82 82 83 io::ssl::__ssl Handle*handle; ///< SSL connection handle83 io::ssl::__sslConnection *handle; ///< SSL connection handle 84 84 85 85 bool blocked; ///< true if blocked … … 144 144 protected: 145 145 146 io::ssl::__ssl Handle*handle; ///< SSL connection handle146 io::ssl::__sslConnection *handle; ///< SSL connection handle 147 147 148 148 /** 149 149 * close socket connection 150 150 * @param socket defines socket descriptor 151 * @param ssl Handledefines SSL handle151 * @param ssl defines SSL handle 152 152 */ 153 153 virtual void _close(int socket, 154 io::ssl::__ssl Handle*handle);154 io::ssl::__sslConnection *handle); 155 155 156 156 /** … … 162 162 */ 163 163 virtual void init(int socket, 164 io::ssl::__ssl Handle*handle,164 io::ssl::__sslConnection *handle, 165 165 bool blocked, 166 166 bool blockInherited); -
trunk/include/libdodo/ioPipe.h
r1183 r1189 160 160 virtual void _writeStream(const char * const data); 161 161 162 void *in Handle; ///< input stream descriptor163 void *out Handle; ///< output stream descriptor162 void *in; ///< input stream descriptor 163 void *out; ///< output stream descriptor 164 164 165 165 private: -
trunk/include/libdodo/ioSsl.h
r1188 r1189 42 42 namespace ssl 43 43 { 44 struct __ssl Handle;44 struct __sslConnection; 45 45 46 46 struct __sslContext; -
trunk/include/libdodo/pcSyncProcessDataSingle.h
r1188 r1189 43 43 namespace process 44 44 { 45 struct __ semaphoreHandle;45 struct __lock; 46 46 47 47 namespace data … … 133 133 void *data; ///< shared data 134 134 135 __ semaphoreHandle*semaphore;135 __lock *semaphore; 136 136 137 137 bool autogenerated; ///< true if key was autogenerated -
trunk/include/libdodo/pcSyncProcessSection.h
r1188 r1189 43 43 namespace process 44 44 { 45 struct __ semaphoreHandle;45 struct __lock; 46 46 47 47 /** … … 114 114 protected: 115 115 116 __ semaphoreHandle*semaphore;116 __lock *semaphore; 117 117 118 118 bool autogenerated; ///< true if key was autogenerated -
trunk/src/cgiFastExchange.cc
r1188 r1189 45 45 exchange::exchange(exchange &cf) : dodo::cgi::exchange(cf.protection), 46 46 channel(cf.protection), 47 request(new __request Handle)47 request(new __request) 48 48 { 49 49 } … … 51 51 //------------------------------------------------------------------- 52 52 53 exchange::exchange(const __request Handle&req,53 exchange::exchange(const __request &req, 54 54 short protection) : dodo::cgi::exchange(protection), 55 55 channel(protection) -
trunk/src/cgiFastRequest.inline
r1188 r1189 40 40 { 41 41 /** 42 * @struct __request Handle42 * @struct __request 43 43 * @brief defines fast CGI request interface 44 44 */ 45 struct __request Handle45 struct __request 46 46 { 47 47 FCGX_Request *request; ///< fast-CGI request handler -
trunk/src/cgiFastServer.cc
r1188 r1189 92 92 { 93 93 FCGX_Request req; 94 __request Handlerequest = {&req};94 __request request = {&req}; 95 95 FCGX_InitRequest(request.request, 0, 0); 96 96 … … 168 168 169 169 FCGX_Request req; 170 __request Handlerequest = {&req};170 __request request = {&req}; 171 171 FCGX_InitRequest(request.request, 0, 0); 172 172 -
trunk/src/dataBaseMysql.cc
r1188 r1189 44 44 { 45 45 /** 46 * @struct __mysql Handle46 * @struct __mysql 47 47 * @brief defines internal handlers for MySQL DBMS interaction 48 48 */ 49 struct __mysql Handle49 struct __mysql 50 50 { 51 51 MYSQL *handle; ///< DB handle … … 60 60 mysql::mysql() : empty(true), 61 61 type(CLIENT_MULTI_STATEMENTS), 62 handle(new __mysql Handle)62 handle(new __mysql) 63 63 64 64 { … … 74 74 mysql::mysql(const __connectionInfo &info) : empty(true), 75 75 type(CLIENT_MULTI_STATEMENTS), 76 handle(new __mysql Handle)76 handle(new __mysql) 77 77 78 78 { -
trunk/src/dataBasePostgresql.cc
r1188 r1189 47 47 { 48 48 /** 49 * @struct __postgresql Handle49 * @struct __postgresql 50 50 * @brief defines internal handlers for MySQL DBMS interaction 51 51 */ 52 struct __postgresql Handle52 struct __postgresql 53 53 { 54 54 PGconn *handle; ///< DB handle … … 109 109 110 110 postgresql::postgresql() : empty(true), 111 handle(new __postgresql Handle)111 handle(new __postgresql) 112 112 { 113 113 handle->handle = NULL; … … 121 121 122 122 postgresql::postgresql(const __connectionInfo &info) : empty(true), 123 handle(new __postgresql Handle)123 handle(new __postgresql) 124 124 { 125 125 #ifndef DATABASE_WO_XEXEC -
trunk/src/dataBaseSqlite.cc
r1188 r1189 45 45 { 46 46 /** 47 * @struct __ mysqlHandle48 * @brief defines internal handlers for MySQLDBMS interaction47 * @struct __sqlite 48 * @brief defines internal handlers for SQLite DBMS interaction 49 49 */ 50 struct __sqlite Handle50 struct __sqlite 51 51 { 52 52 sqlite3 *handle; ///< DB handle … … 60 60 61 61 sqlite::sqlite() : empty(true), 62 handle(new __sqlite Handle)62 handle(new __sqlite) 63 63 { 64 64 handle->handle = NULL; … … 72 72 73 73 sqlite::sqlite(const __connectionInfo &info) : empty(true), 74 handle(new __sqlite Handle)74 handle(new __sqlite) 75 75 { 76 76 handle->handle = NULL; -
trunk/src/dataFormatXmlProcessor.cc
r1188 r1189 49 49 { 50 50 /** 51 * @struct __node Handle51 * @struct __node 52 52 * @brief defines XML node properties 53 53 */ 54 struct __node Handle54 struct __node 55 55 { 56 56 /** 57 57 * constructor 58 58 */ 59 __nodeHandle(); 59 __node() 60 { 61 } 60 62 61 63 /** 62 64 * constructor 63 65 */ 64 __nodeHandle(xmlNodePtr node); 66 __node(xmlNodePtr node) : node(node) 67 { 68 } 65 69 66 70 xmlNodePtr node; ///< represents internal libxml2 node data … … 68 72 69 73 /** 70 * @struct __doc Handleument74 * @struct __doc 71 75 * @brief defines XML document properties 72 76 */ 73 struct __doc Handle77 struct __doc 74 78 { 75 79 xmlDocPtr document; ///< represents internal libxml2 document data … … 83 87 using namespace dodo::data::format::xml; 84 88 85 #ifdef LIBXML2_EXT86 __nodeHandle::__nodeHandle(xmlNodePtr node) : node(node)87 {88 }89 90 //-------------------------------------------------------------------91 92 __nodeHandle::__nodeHandle()93 {94 }95 #endif96 97 //-------------------------------------------------------------------98 99 89 __info::__info(const dodoString &version, 100 90 const dodoString &encoding, … … 115 105 //------------------------------------------------------------------- 116 106 117 __node HandleDef::__nodeHandleDef() : allChildren(true),107 __nodeDef::__nodeDef() : allChildren(true), 118 108 allAttributes(true) 119 109 { … … 122 112 //------------------------------------------------------------------- 123 113 124 __node HandleDef::__nodeHandleDef(const dodoString &name,114 __nodeDef::__nodeDef(const dodoString &name, 125 115 const dodoString &ns) : allChildren(true), 126 116 allAttributes(true), … … 169 159 #ifdef LIBXML2_EXT 170 160 , 171 document(new __doc Handle)161 document(new __doc) 172 162 #endif 173 163 { … … 195 185 #ifdef LIBXML2_EXT 196 186 bool 197 processor::isCDATA(const __node Handle&a_xnode)187 processor::isCDATA(const __node &a_xnode) 198 188 { 199 189 xmlNodePtr xnode = a_xnode.node->children; … … 215 205 216 206 node 217 processor::processFile(const __node HandleDef &definition,207 processor::processFile(const __nodeDef &definition, 218 208 const dodoString &file) 219 209 { … … 243 233 244 234 node 245 processor::processString(const __node HandleDef &definition,235 processor::processString(const __nodeDef &definition, 246 236 const dodoString &buffer) 247 237 { … … 271 261 272 262 node 273 processor::parse(const __node HandleDef &definition)274 { 275 #ifdef LIBXML2_EXT 276 __node Handlexnode = xmlDocGetRootElement(document->document);263 processor::parse(const __nodeDef &definition) 264 { 265 #ifdef LIBXML2_EXT 266 __node xnode = xmlDocGetRootElement(document->document); 277 267 if (xnode.node == NULL) 278 268 { … … 334 324 if (xnode.node->children != NULL) 335 325 { 336 children = parse(__node Handle(xnode.node->children));326 children = parse(__node(xnode.node->children)); 337 327 i = children.begin(); 338 328 j = children.end(); … … 354 344 if (definition.children.size() > 0) 355 345 { 356 dodoMap<dodoString, __node HandleDef>::const_iterator i(definition.children.begin()), j(definition.children.end());346 dodoMap<dodoString, __nodeDef>::const_iterator i(definition.children.begin()), j(definition.children.end()); 357 347 for (; i != j; ++i) 358 348 { … … 372 362 #ifdef LIBXML2_EXT 373 363 dodoArray<node> 374 processor::parse(const __node HandleDef &definition,375 const __node Handle&a_xnode)364 processor::parse(const __nodeDef &definition, 365 const __node &a_xnode) 376 366 { 377 367 xmlNodePtr xnode = a_xnode.node, subNode; … … 468 458 if (definition.children.size() > 0) 469 459 { 470 dodoMap<dodoString, __node HandleDef>::const_iterator i(definition.children.begin()), j(definition.children.end());460 dodoMap<dodoString, __nodeDef>::const_iterator i(definition.children.begin()), j(definition.children.end()); 471 461 for (; i != j; ++i) 472 462 { … … 489 479 #ifdef LIBXML2_EXT 490 480 void 491 processor::getAttributes(const __node HandleDef &definition,492 const __node Handle&xnode,481 processor::getAttributes(const __nodeDef &definition, 482 const __node &xnode, 493 483 dodoStringMap &attributes) 494 484 { … … 555 545 556 546 void 557 processor::getAttributes(const __node Handle&xnode,547 processor::getAttributes(const __node &xnode, 558 548 dodoStringMap &attributes) 559 549 { … … 576 566 577 567 void 578 processor::getNodeInfo(const __node Handle&xnode,568 processor::getNodeInfo(const __node &xnode, 579 569 node &resNode) 580 570 { … … 677 667 #ifdef LIBXML2_EXT 678 668 dodoArray<node> 679 processor::parse(__node Handlexnode)669 processor::parse(__node xnode) 680 670 { 681 671 dodoArray<node> sample; … … 703 693 if (xnode.node->children != NULL) 704 694 { 705 children = parse(__node Handle(xnode.node->children));695 children = parse(__node(xnode.node->children)); 706 696 i = children.begin(); 707 697 j = children.end(); … … 776 766 } 777 767 778 return *(parse(__node Handle(xnode)).begin());768 return *(parse(__node(xnode)).begin()); 779 769 #else 780 770 return node(); … … 820 810 } 821 811 822 return *(parse(__node Handle(xnode)).begin());812 return *(parse(__node(xnode)).begin()); 823 813 #else 824 814 return node(); … … 829 819 830 820 void 831 processor::initNodeDef(__node HandleDef &xnode)821 processor::initNodeDef(__nodeDef &xnode) 832 822 { 833 823 xnode.attributes.clear(); … … 840 830 841 831 #ifdef LIBXML2_EXT 842 __node Handle843 processor::findNode(const __node HandleDef &definition,844 const __node Handle&a_xnode)832 __node 833 processor::findNode(const __nodeDef &definition, 834 const __node &a_xnode) 845 835 { 846 836 xmlNodePtr one, xnode = a_xnode.node; … … 880 870 } 881 871 882 one = findNode(definition, __node Handle(xnode->children)).node;872 one = findNode(definition, __node(xnode->children)).node; 883 873 884 874 if (one != NULL) … … 890 880 } 891 881 892 return __node Handle(NULL);882 return __node(NULL); 893 883 } 894 884 #endif -
trunk/src/dataMemoryShared.cc
r1188 r1189 53 53 { 54 54 /** 55 * @struct __key Handle55 * @struct __key 56 56 * @brief defines shared memory key 57 57 */ 58 struct __key Handle58 struct __key 59 59 { 60 60 #ifdef XSI_IPC … … 78 78 shared::shared() : mshared(NULL), 79 79 autogenerated(false), 80 key(new __key Handle),80 key(new __key), 81 81 #ifndef XSI_IPC 82 82 size(0), … … 90 90 shared::shared(int a_key) : mshared(NULL), 91 91 autogenerated(false), 92 key(new __key Handle),92 key(new __key), 93 93 #ifndef XSI_IPC 94 94 size(0), -
trunk/src/graphicsDraw.cc
r1181 r1189 94 94 unsigned short borderWidth) 95 95 { 96 if (im == NULL || im->collectedData.handle->im Handle== NULL)96 if (im == NULL || im->collectedData.handle->im == NULL) 97 97 { 98 98 throw exception::basic(exception::ERRMODULE_GRAPHICSDRAW, DRAWEX_PRIMITIVE, exception::ERRNO_IMAGEMAGICK, DRAWEX_EMPTYIMAGE, GRAPHICSDRAWEX_EMPTYIMAGE_STR, __LINE__, __FILE__); … … 119 119 di->fill.opacity = fillColor.opacity; 120 120 121 if (DrawImage(im->collectedData.handle->im Handle, di) == MagickFalse)121 if (DrawImage(im->collectedData.handle->im, di) == MagickFalse) 122 122 { 123 123 di->primitive = NULL; … … 196 196 double angle) 197 197 { 198 if (im == NULL || im->collectedData.handle->im Handle== NULL)198 if (im == NULL || im->collectedData.handle->im == NULL) 199 199 { 200 200 throw exception::basic(exception::ERRMODULE_GRAPHICSDRAW, DRAWEX_TEXT, exception::ERRNO_IMAGEMAGICK, DRAWEX_EMPTYIMAGE, GRAPHICSDRAWEX_EMPTYIMAGE_STR, __LINE__, __FILE__); … … 252 252 di->fill.opacity = fillColor.opacity; 253 253 254 if (DrawImage(im->collectedData.handle->im Handle, di) == MagickFalse)254 if (DrawImage(im->collectedData.handle->im, di) == MagickFalse) 255 255 { 256 256 di->primitive = NULL; … … 273 273 double angle) 274 274 { 275 if (im == NULL || im->collectedData.handle->im Handle== NULL)275 if (im == NULL || im->collectedData.handle->im == NULL) 276 276 { 277 277 throw exception::basic(exception::ERRMODULE_GRAPHICSDRAW, DRAWEX_IMAGE, exception::ERRNO_IMAGEMAGICK, DRAWEX_EMPTYIMAGE, GRAPHICSDRAWEX_EMPTYIMAGE_STR, __LINE__, __FILE__); … … 305 305 current.ty = _current.rx * affine.tx + _current.sy * affine.ty + _current.ty; 306 306 307 if (DrawAffineImage(im->collectedData.handle->im Handle, a_im.collectedData.handle->imHandle, ¤t) == MagickFalse)307 if (DrawAffineImage(im->collectedData.handle->im, a_im.collectedData.handle->im, ¤t) == MagickFalse) 308 308 { 309 309 throw exception::basic(exception::ERRMODULE_GRAPHICSDRAW, DRAWEX_IMAGE, exception::ERRNO_IMAGEMAGICK, DRAWEX_CANNOTDRAWPRIMITIVE, GRAPHICSDRAWEX_CANNOTDRAWPRIMITIVE_STR, __LINE__, __FILE__); … … 318 318 unsigned short pointWidth) 319 319 { 320 if (im == NULL || im->collectedData.handle->im Handle== NULL)320 if (im == NULL || im->collectedData.handle->im == NULL) 321 321 { 322 322 throw exception::basic(exception::ERRMODULE_GRAPHICSDRAW, DRAWEX_POINT, exception::ERRNO_IMAGEMAGICK, DRAWEX_EMPTYIMAGE, GRAPHICSDRAWEX_EMPTYIMAGE_STR, __LINE__, __FILE__); … … 347 347 di->fill.opacity = pointColor.opacity; 348 348 349 if (DrawImage(im->collectedData.handle->im Handle, di) == MagickFalse)349 if (DrawImage(im->collectedData.handle->im, di) == MagickFalse) 350 350 { 351 351 di->primitive = NULL; -
trunk/src/graphicsImage.cc
r1181 r1189 104 104 __xexecImageCollectedData::__xexecImageCollectedData(xexec *executor, 105 105 short execObject) : __xexecCollectedData(executor, execObject), 106 handle(new __image Handle)106 handle(new __image) 107 107 { 108 108 } 109 109 #else 110 __xexecImageCollectedData::__xexecImageCollectedData() : handle(new __image Handle)110 __xexecImageCollectedData::__xexecImageCollectedData() : handle(new __image) 111 111 { 112 112 } … … 242 242 #endif 243 243 { 244 collectedData.handle->im Handle= NULL;244 collectedData.handle->im = NULL; 245 245 246 246 #ifndef IMAGEMAGICK_PRE_63 … … 255 255 image::~image() 256 256 { 257 if (collectedData.handle->im Handle!= NULL)258 { 259 DestroyImage(collectedData.handle->im Handle);257 if (collectedData.handle->im != NULL) 258 { 259 DestroyImage(collectedData.handle->im); 260 260 } 261 261 … … 288 288 strncpy(collectedData.handle->imInfo->filename, str.c_str(), size); 289 289 290 if (collectedData.handle->im Handle!= NULL)291 { 292 DestroyImage(collectedData.handle->im Handle);293 } 294 295 collectedData.handle->im Handle= ReadImage(collectedData.handle->imInfo, (ExceptionInfo *)exInfo);296 if (collectedData.handle->im Handle== NULL)290 if (collectedData.handle->im != NULL) 291 { 292 DestroyImage(collectedData.handle->im); 293 } 294 295 collectedData.handle->im = ReadImage(collectedData.handle->imInfo, (ExceptionInfo *)exInfo); 296 if (collectedData.handle->im == NULL) 297 297 { 298 298 throw exception::basic(exception::ERRMODULE_GRAPHICSIMAGE, IMAGEEX_READ, exception::ERRNO_IMAGEMAGICK, ((ExceptionInfo *)exInfo)->error_number, ((ExceptionInfo *)exInfo)->reason, __LINE__, __FILE__, ((ExceptionInfo *)exInfo)->description); 299 299 } 300 300 301 collectedData.handle->imInfo->compression = collectedData.handle->im Handle->compression;302 collectedData.handle->imInfo->quality = collectedData.handle->im Handle->quality;303 304 strcpy(collectedData.handle->imInfo->magick, collectedData.handle->im Handle->magick);301 collectedData.handle->imInfo->compression = collectedData.handle->im->compression; 302 collectedData.handle->imInfo->quality = collectedData.handle->im->quality; 303 304 strcpy(collectedData.handle->imInfo->magick, collectedData.handle->im->magick); 305 305 306 306 #ifndef GRAPHICS_WO_XEXEC … … 322 322 GetImageInfo(collectedData.handle->imInfo); 323 323 324 if (collectedData.handle->im Handle!= NULL)325 { 326 DestroyImage(collectedData.handle->im Handle);327 } 328 329 collectedData.handle->im Handle= BlobToImage(collectedData.handle->imInfo, data.data(), data.size(), (ExceptionInfo *)exInfo);330 if (collectedData.handle->im Handle== NULL)324 if (collectedData.handle->im != NULL) 325 { 326 DestroyImage(collectedData.handle->im); 327 } 328 329 collectedData.handle->im = BlobToImage(collectedData.handle->imInfo, data.data(), data.size(), (ExceptionInfo *)exInfo); 330 if (collectedData.handle->im == NULL) 331 331 { 332 332 throw exception::basic(exception::ERRMODULE_GRAPHICSIMAGE, IMAGEEX_READ, exception::ERRNO_IMAGEMAGICK, ((ExceptionInfo *)exInfo)->error_number, ((ExceptionInfo *)exInfo)->reason, __LINE__, __FILE__, ((ExceptionInfo *)exInfo)->description); 333 333 } 334 334 335 collectedData.handle->imInfo->compression = collectedData.handle->im Handle->compression;336 collectedData.handle->imInfo->quality = collectedData.handle->im Handle->quality;337 338 strcpy(collectedData.handle->imInfo->magick, collectedData.handle->im Handle->magick);335 collectedData.handle->imInfo->compression = collectedData.handle->im->compression; 336 collectedData.handle->imInfo->quality = collectedData.handle->im->quality; 337 338 strcpy(collectedData.handle->imInfo->magick, collectedData.handle->im->magick); 339 339 340 340 #ifndef GRAPHICS_WO_XEXEC … … 361 361 GetImageInfo(collectedData.handle->imInfo); 362 362 363 if (collectedData.handle->im Handle!= NULL)364 { 365 DestroyImage(collectedData.handle->im Handle);366 } 367 368 collectedData.handle->im Handle= ConstituteImage(info.width, info.height, mappingStArr[info.mapping], (StorageType)pixelSizeStArr[info.pixelSize], info.data, (ExceptionInfo *)exInfo);369 if (collectedData.handle->im Handle== NULL)363 if (collectedData.handle->im != NULL) 364 { 365 DestroyImage(collectedData.handle->im); 366 } 367 368 collectedData.handle->im = ConstituteImage(info.width, info.height, mappingStArr[info.mapping], (StorageType)pixelSizeStArr[info.pixelSize], info.data, (ExceptionInfo *)exInfo); 369 if (collectedData.handle->im == NULL) 370 370 { 371 371 throw exception::basic(exception::ERRMODULE_GRAPHICSIMAGE, IMAGEEX_READ, exception::ERRNO_IMAGEMAGICK, ((ExceptionInfo *)exInfo)->error_number, ((ExceptionInfo *)exInfo)->reason, __LINE__, __FILE__, ((ExceptionInfo *)exInfo)->description); 372 372 } 373 373 374 collectedData.handle->imInfo->compression = collectedData.handle->im Handle->compression;375 collectedData.handle->imInfo->quality = collectedData.handle->im Handle->quality;376 377 strcpy(collectedData.handle->imInfo->magick, collectedData.handle->im Handle->magick);374 collectedData.handle->imInfo->compression = collectedData.handle->im->compression; 375 collectedData.handle->imInfo->quality = collectedData.handle->im->quality; 376 377 strcpy(collectedData.handle->imInfo->magick, collectedData.handle->im->magick); 378 378 379 379 #ifndef GRAPHICS_WO_XEXEC … … 398 398 GetImageInfo(collectedData.handle->imInfo); 399 399 400 if (collectedData.handle->im Handle!= NULL)401 { 402 DestroyImage(collectedData.handle->im Handle);400 if (collectedData.handle->im != NULL) 401 { 402 DestroyImage(collectedData.handle->im); 403 403 } 404 404 … … 416 416 bg.index = 0; 417 417 418 collectedData.handle->im Handle= NewMagickImage(collectedData.handle->imInfo, width, height, &bg);419 if (collectedData.handle->im Handle== NULL)418 collectedData.handle->im = NewMagickImage(collectedData.handle->imInfo, width, height, &bg); 419 if (collectedData.handle->im == NULL) 420 420 { 421 421 throw exception::basic(exception::ERRMODULE_GRAPHICSIMAGE, IMAGEEX_CREATE, exception::ERRNO_IMAGEMAGICK, ((ExceptionInfo *)exInfo)->error_number, ((ExceptionInfo *)exInfo)->reason, __LINE__, __FILE__, ((ExceptionInfo *)exInfo)->description); 422 422 } 423 423 424 collectedData.handle->imInfo->compression = collectedData.handle->im Handle->compression;425 collectedData.handle->imInfo->quality = collectedData.handle->im Handle->quality;426 427 strcpy(collectedData.handle->imInfo->magick, collectedData.handle->im Handle->magick);424 collectedData.handle->imInfo->compression = collectedData.handle->im->compression; 425 collectedData.handle->imInfo->quality = collectedData.handle->im->quality; 426 427 strcpy(collectedData.handle->imInfo->magick, collectedData.handle->im->magick); 428 428 429 429 #ifndef GRAPHICS_WO_XEXEC … … 442 442 } 443 443 444 if (collectedData.handle->im Handle== NULL)444 if (collectedData.handle->im == NULL) 445 445 { 446 446 throw exception::basic(exception::ERRMODULE_GRAPHICSIMAGE, IMAGEEX_SETTYPE, exception::ERRNO_IMAGEMAGICK, IMAGEEX_EMPTYIMAGE, GRAPHICSIMAGEEX_EMPTYIMAGE_STR, __LINE__, __FILE__); 447 447 } 448 448 449 if (SetImageType(collectedData.handle->im Handle, (ImageType)typeStArr[type]) == MagickFalse)449 if (SetImageType(collectedData.handle->im, (ImageType)typeStArr[type]) == MagickFalse) 450 450 { 451 451 throw exception::basic(exception::ERRMODULE_GRAPHICSIMAGE, IMAGEEX_SETTYPE, exception::ERRNO_IMAGEMAGICK, IMAGEEX_CANNOTSETTYPE, GRAPHICSIMAGEEX_CANNOTSETTYPE_STR, __LINE__, __FILE__); … … 458 458 image::setAlpha() 459 459 { 460 if (collectedData.handle->im Handle== NULL)460 if (collectedData.handle->im == NULL) 461 461 { 462 462 throw exception::basic(exception::ERRMODULE_GRAPHICSIMAGE, IMAGEEX_SETALPHA, exception::ERRNO_IMAGEMAGICK, IMAGEEX_EMPTYIMAGE, GRAPHICSIMAGEEX_EMPTYIMAGE_STR, __LINE__, __FILE__); 463 463 } 464 464 465 collectedData.handle->im Handle->matte = MagickTrue;465 collectedData.handle->im->matte = MagickTrue; 466 466 } 467 467 … … 471 471 image::removeAlpha() 472 472 { 473 if (collectedData.handle->im Handle== NULL)473 if (collectedData.handle->im == NULL) 474 474 { 475 475 throw exception::basic(exception::ERRMODULE_GRAPHICSIMAGE, IMAGEEX_REMOVEALPHA, exception::ERRNO_IMAGEMAGICK, IMAGEEX_EMPTYIMAGE, GRAPHICSIMAGEEX_EMPTYIMAGE_STR, __LINE__, __FILE__); 476 476 } 477 477 478 collectedData.handle->im Handle->matte = MagickFalse;478 collectedData.handle->im->matte = MagickFalse; 479 479 } 480 480 … … 484 484 image::setOpacity(unsigned short opacity) 485 485 { 486 if (collectedData.handle->im Handle== NULL)486 if (collectedData.handle->im == NULL) 487 487 { 488 488 throw exception::basic(exception::ERRMODULE_GRAPHICSIMAGE, IMAGEEX_SETOPACITY, exception::ERRNO_IMAGEMAGICK, IMAGEEX_EMPTYIMAGE, GRAPHICSIMAGEEX_EMPTYIMAGE_STR, __LINE__, __FILE__); 489 489 } 490 490 491 SetImageOpacity(collectedData.handle->im Handle, opacity);491 SetImageOpacity(collectedData.handle->im, opacity); 492 492 } 493 493 … … 497 497 image::setBackgroundColor(__color background) 498 498 { 499 if (collectedData.handle->im Handle== NULL)499 if (collectedData.handle->im == NULL) 500 500 { 501 501 throw exception::basic(exception::ERRMODULE_GRAPHICSIMAGE, IMAGEEX_SETBACKGROUNDCOLOR, exception::ERRNO_IMAGEMAGICK, IMAGEEX_EMPTYIMAGE, GRAPHICSIMAGEEX_EMPTYIMAGE_STR, __LINE__, __FILE__); 502 502 } 503 503 504 collectedData.handle->im Handle->background_color.red = background.red;505 collectedData.handle->im Handle->background_color.green = background.green;506 collectedData.handle->im Handle->background_color.blue = background.blue;507 collectedData.handle->im Handle->background_color.opacity = background.opacity;508 509 SetImageBackgroundColor(collectedData.handle->im Handle);504 collectedData.handle->im->background_color.red = background.red; 505 collectedData.handle->im->background_color.green = background.green; 506 collectedData.handle->im->background_color.blue = background.blue; 507 collectedData.handle->im->background_color.opacity = background.opacity; 508 509 SetImageBackgroundColor(collectedData.handle->im); 510 510 } 511 511 … … 515 515 image::close() 516 516 { 517 if (collectedData.handle->im Handle!= NULL)518 { 519 DestroyImage(collectedData.handle->im Handle);520 521 collectedData.handle->im Handle= NULL;517 if (collectedData.handle->im != NULL) 518 { 519 DestroyImage(collectedData.handle->im); 520 521 collectedData.handle->im = NULL; 522 522 } 523 523 } … … 533 533 #endif 534 534 535 if (collectedData.handle->im Handle== NULL)535 if (collectedData.handle->im == NULL) 536 536 { 537 537 throw exception::basic(exception::ERRMODULE_GRAPHICSIMAGE, IMAGEEX_WRITE, exception::ERRNO_IMAGEMAGICK, IMAGEEX_EMPTYIMAGE, GRAPHICSIMAGEEX_EMPTYIMAGE_STR, __LINE__, __FILE__); … … 545 545 } 546 546 547 strncpy(collectedData.handle->im Handle->filename, str.c_str(), size);547 strncpy(collectedData.handle->im->filename, str.c_str(), size); 548 548 549 549 GetExceptionInfo((ExceptionInfo *)exInfo); 550 550 551 if (WriteImage(collectedData.handle->imInfo, collectedData.handle->im Handle) == MagickFalse)552 { 553 throw exception::basic(exception::ERRMODULE_GRAPHICSIMAGE, IMAGEEX_WRITE, exception::ERRNO_IMAGEMAGICK, collectedData.handle->im Handle->exception.error_number, ((ExceptionInfo *)exInfo)->reason, __LINE__, __FILE__, ((ExceptionInfo *)exInfo)->description);551 if (WriteImage(collectedData.handle->imInfo, collectedData.handle->im) == MagickFalse) 552 { 553 throw exception::basic(exception::ERRMODULE_GRAPHICSIMAGE, IMAGEEX_WRITE, exception::ERRNO_IMAGEMAGICK, collectedData.handle->im->exception.error_number, ((ExceptionInfo *)exInfo)->reason, __LINE__, __FILE__, ((ExceptionInfo *)exInfo)->description); 554 554 } 555 555 … … 569 569 #endif 570 570 571 if (collectedData.handle->im Handle== NULL)571 if (collectedData.handle->im == NULL) 572 572 { 573 573 throw exception::basic(exception::ERRMODULE_GRAPHICSIMAGE, IMAGEEX_WRITE, exception::ERRNO_IMAGEMAGICK, IMAGEEX_EMPTYIMAGE, GRAPHICSIMAGEEX_EMPTYIMAGE_STR, __LINE__, __FILE__); … … 577 577 578 578 unsigned long size = 0; 579 unsigned char *imData = ImageToBlob(collectedData.handle->imInfo, collectedData.handle->im Handle, (size_t *)&size, (ExceptionInfo *)exInfo);579 unsigned char *imData = ImageToBlob(collectedData.handle->imInfo, collectedData.handle->im, (size_t *)&size, (ExceptionInfo *)exInfo); 580 580 if (imData == NULL) 581 581 { … … 665 665 image::getImageSize() 666 666 { 667 if (collectedData.handle->im Handle== NULL)667 if (collectedData.handle->im == NULL) 668 668 { 669 669 return __imageSize(); … … 672 672 __imageSize info; 673 673 674 info.height = collectedData.handle->im Handle->rows;675 info.width = collectedData.handle->im Handle->columns;674 info.height = collectedData.handle->im->rows; 675 info.width = collectedData.handle->im->columns; 676 676 677 677 return info; -
trunk/src/graphicsImage.inline
r1188 r1189 42 42 { 43 43 /** 44 * @struct __image Handle44 * @struct __image 45 45 * @brief defines internal handlers for image processing library 46 46 */ 47 struct __image Handle47 struct __image 48 48 { 49 49 ImageInfo *imInfo; ///< image info handler 50 Image *im Handle; ///< image handler50 Image *im; ///< image handler 51 51 }; 52 52 }; -
trunk/src/graphicsTransform.cc
r1183 r1189 83 83 unsigned long height) 84 84 { 85 if (im == NULL || im->collectedData.handle->im Handle== NULL)85 if (im == NULL || im->collectedData.handle->im == NULL) 86 86 { 87 87 throw exception::basic(exception::ERRMODULE_GRAPHICSTRANSFORM, TRANSFORMEX_SCALE, exception::ERRNO_IMAGEMAGICK, TRANSFORMEX_EMPTYIMAGE, GRAPHICSTRANSFORMEX_EMPTYIMAGE_STR, __LINE__, __FILE__); … … 90 90 GetExceptionInfo((ExceptionInfo *)im->exInfo); 91 91 92 Image *image = ScaleImage(im->collectedData.handle->im Handle, width, height, (ExceptionInfo *)im->exInfo);92 Image *image = ScaleImage(im->collectedData.handle->im, width, height, (ExceptionInfo *)im->exInfo); 93 93 94 94 if (image == NULL) … … 97 97 } 98 98 99 DestroyImage(im->collectedData.handle->im Handle);99 DestroyImage(im->collectedData.handle->im); 100 100 101 im->collectedData.handle->im Handle= image;101 im->collectedData.handle->im = image; 102 102 } 103 103 … … 107 107 transform::scale(unsigned long size) 108 108 { 109 if (im == NULL || im->collectedData.handle->im Handle== NULL)109 if (im == NULL || im->collectedData.handle->im == NULL) 110 110 { 111 111 throw exception::basic(exception::ERRMODULE_GRAPHICSTRANSFORM, TRANSFORMEX_SCALE, exception::ERRNO_IMAGEMAGICK, TRANSFORMEX_EMPTYIMAGE, GRAPHICSTRANSFORMEX_EMPTYIMAGE_STR, __LINE__, __FILE__); 112 112 } 113 113 114 float mult = (float)size / (float)((im->collectedData.handle->im Handle->columns > im->collectedData.handle->imHandle->rows) ? im->collectedData.handle->imHandle->columns : im->collectedData.handle->imHandle->rows);114 float mult = (float)size / (float)((im->collectedData.handle->im->columns > im->collectedData.handle->im->rows) ? im->collectedData.handle->im->columns : im->collectedData.handle->im->rows); 115 115 116 116 GetExceptionInfo((ExceptionInfo *)im->exInfo); 117 117 118 Image *image = ScaleImage(im->collectedData.handle->im Handle, (unsigned long)floor(im->collectedData.handle->imHandle->columns * mult), (unsigned long)floor(im->collectedData.handle->imHandle->rows * mult), (ExceptionInfo *)im->exInfo);118 Image *image = ScaleImage(im->collectedData.handle->im, (unsigned long)floor(im->collectedData.handle->im->columns * mult), (unsigned long)floor(im->collectedData.handle->im->rows * mult), (ExceptionInfo *)im->exInfo); 119 119 120 120 if (image == NULL) … … 123 123 } 124 124 125 DestroyImage(im->collectedData.handle->im Handle);125 DestroyImage(im->collectedData.handle->im); 126 126 127 im->collectedData.handle->im Handle= image;127 im->collectedData.handle->im = image; 128 128 } 129 129 … … 133 133 transform::rotate(double angle) 134 134 { 135 if (im == NULL || im->collectedData.handle->im Handle== NULL)135 if (im == NULL || im->collectedData.handle->im == NULL) 136 136 { 137 137 throw exception::basic(exception::ERRMODULE_GRAPHICSTRANSFORM, TRANSFORMEX_ROTATE, exception::ERRNO_IMAGEMAGICK, TRANSFORMEX_EMPTYIMAGE, GRAPHICSTRANSFORMEX_EMPTYIMAGE_STR, __LINE__, __FILE__); … … 140 140 GetExceptionInfo((ExceptionInfo *)im->exInfo); 141 141 142 Image *image = RotateImage(im->collectedData.handle->im Handle, angle, (ExceptionInfo *)im->exInfo);142 Image *image = RotateImage(im->collectedData.handle->im, angle, (ExceptionInfo *)im->exInfo); 143 143 144 144 if (image == NULL) … … 147 147 } 148 148 149 DestroyImage(im->collectedData.handle->im Handle);149 DestroyImage(im->collectedData.handle->im); 150 150 151 im->collectedData.handle->im Handle= image;151 im->collectedData.handle->im = image; 152 152 } 153 153 -
trunk/src/ioNetworkSslClient.cc
r1185 r1189 60 60 a_type), 61 61 sslConnected(false), 62 handle(new io::ssl::__ssl Handle),62 handle(new io::ssl::__sslConnection), 63 63 ctx(new io::ssl::__sslContext) 64 64 { -
trunk/src/ioNetworkSslExchange.cc
r1185 r1189 49 49 50 50 __initialAccept::__initialAccept() : socket(-1), 51 handle(new io::ssl::__ssl Handle)51 handle(new io::ssl::__sslConnection) 52 52 { 53 53 handle->handle = NULL; … … 57 57 58 58 __initialAccept::__initialAccept(__initialAccept &init) : socket(init.socket), 59 handle(new io::ssl::__ssl Handle)59 handle(new io::ssl::__sslConnection) 60 60 { 61 61 handle->handle = init.handle->handle; … … 89 89 90 90 exchange::exchange(short protection) : channel(protection), 91 handle(new io::ssl::__ssl Handle)91 handle(new io::ssl::__sslConnection) 92 92 { 93 93 #ifndef IO_WO_XEXEC … … 102 102 exchange::exchange(__initialAccept &a_init, 103 103 short protection) : channel(protection), 104 handle(new io::ssl::__ssl Handle)104 handle(new io::ssl::__sslConnection) 105 105 { 106 106 #ifndef IO_WO_XEXEC … … 143 143 void 144 144 exchange::_close(int socket, 145 io::ssl::__ssl Handle*handle)145 io::ssl::__sslConnection *handle) 146 146 { 147 147 int err = SSL_shutdown(handle->handle); … … 193 193 void 194 194 exchange::init(int a_socket, 195 io::ssl::__ssl Handle*a_handle,195 io::ssl::__sslConnection *a_handle, 196 196 bool a_blocked, 197 197 bool blockInherited) -
trunk/src/ioPipe.cc
r1183 r1189 46 46 outPipeBuffer(IOPIPE_OUTSIZE), 47 47 blocked(true), 48 in Handle(NULL),49 out Handle(NULL),48 in(NULL), 49 out(NULL), 50 50 channel(protection) 51 51 { … … 63 63 } 64 64 65 in Handle= fdopen(pipefd[0], "r");66 if (in Handle== NULL)67 { 68 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_PIPE, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); 69 } 70 71 out Handle= fdopen(pipefd[1], "w");72 if (out Handle== NULL)65 in = fdopen(pipefd[0], "r"); 66 if (in == NULL) 67 { 68 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_PIPE, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); 69 } 70 71 out = fdopen(pipefd[1], "w"); 72 if (out == NULL) 73 73 { 74 74 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_PIPE, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); … … 82 82 outPipeBuffer(fd.outPipeBuffer), 83 83 blocked(fd.blocked), 84 in Handle(NULL),85 out Handle(NULL),84 in(NULL), 85 out(NULL), 86 86 channel(protection) 87 87 { … … 93 93 outSize = fd.outSize; 94 94 95 if (fd.in Handle != NULL && fd.outHandle!= NULL)95 if (fd.in != NULL && fd.out != NULL) 96 96 { 97 97 int oldDesc, newDesc; 98 98 99 oldDesc = fileno((FILE *)fd.in Handle);99 oldDesc = fileno((FILE *)fd.in); 100 100 if (oldDesc == -1) 101 101 { … … 109 109 } 110 110 111 in Handle= fdopen(newDesc, "r");112 if (in Handle== NULL)113 { 114 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_PIPE, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); 115 } 116 117 oldDesc = fileno((FILE *)fd.out Handle);111 in = fdopen(newDesc, "r"); 112 if (in == NULL) 113 { 114 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_PIPE, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); 115 } 116 117 oldDesc = fileno((FILE *)fd.out); 118 118 if (oldDesc == -1) 119 119 { … … 127 127 } 128 128 129 out Handle= fdopen(newDesc, "w");130 if (out Handle== NULL)129 out = fdopen(newDesc, "w"); 130 if (out == NULL) 131 131 { 132 132 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_PIPE, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); … … 139 139 io::pipe::~pipe() 140 140 { 141 if (in Handle!= NULL)142 { 143 fclose((FILE *)in Handle);144 } 145 146 if (out Handle!= NULL)147 { 148 fclose((FILE *)out Handle);141 if (in != NULL) 142 { 143 fclose((FILE *)in); 144 } 145 146 if (out != NULL) 147 { 148 fclose((FILE *)out); 149 149 } 150 150 } … … 157 157 pc::sync::protector pg(keeper); 158 158 159 if (in Handle!= NULL)160 { 161 if (fclose((FILE *)in Handle) != 0)159 if (in != NULL) 160 { 161 if (fclose((FILE *)in) != 0) 162 162 { 163 163 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_CLONE, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); 164 164 } 165 165 166 in Handle= NULL;167 } 168 169 if (out Handle!= NULL)170 { 171 if (fclose((FILE *)out Handle) != 0)166 in = NULL; 167 } 168 169 if (out != NULL) 170 { 171 if (fclose((FILE *)out) != 0) 172 172 { 173 173 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_CLONE, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); 174 174 } 175 175 176 out Handle= NULL;176 out = NULL; 177 177 } 178 178 … … 183 183 outSize = fd.outSize; 184 184 185 if (fd.in Handle != NULL && fd.outHandle!= NULL)185 if (fd.in != NULL && fd.out != NULL) 186 186 { 187 187 int oldDesc, newDesc; 188 188 189 oldDesc = fileno((FILE *)fd.in Handle);189 oldDesc = fileno((FILE *)fd.in); 190 190 if (oldDesc == -1) 191 191 { … … 199 199 } 200 200 201 in Handle= fdopen(newDesc, "r");202 if (in Handle== NULL)201 in = fdopen(newDesc, "r"); 202 if (in == NULL) 203 203 { 204 204 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_CLONE, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); 205 205 } 206 206 207 oldDesc = fileno((FILE *)fd.out Handle);207 oldDesc = fileno((FILE *)fd.out); 208 208 if (oldDesc == -1) 209 209 { … … 217 217 } 218 218 219 out Handle= fdopen(newDesc, "w");220 if (out Handle== NULL)219 out = fdopen(newDesc, "w"); 220 if (out == NULL) 221 221 { 222 222 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_CLONE, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); … … 232 232 pc::sync::protector pg(keeper); 233 233 234 if (in Handle== NULL)234 if (in == NULL) 235 235 { 236 236 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_GETINDESCRIPTOR, exception::ERRNO_LIBDODO, PIPEEX_PIPENOTOPENED, IOPIPEEX_NOTOPENED_STR, __LINE__, __FILE__); 237 237 } 238 238 239 return fileno((FILE *)in Handle);239 return fileno((FILE *)in); 240 240 } 241 241 … … 247 247 pc::sync::protector pg(keeper); 248 248 249 if (out Handle== NULL)249 if (out == NULL) 250 250 { 251 251 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_GETOUTDESCRIPTOR, exception::ERRNO_LIBDODO, PIPEEX_PIPENOTOPENED, IOPIPEEX_NOTOPENED_STR, __LINE__, __FILE__); 252 252 } 253 253 254 return fileno((FILE *)out Handle);254 return fileno((FILE *)out); 255 255 } 256 256 … … 267 267 #endif 268 268 269 if (in Handle!= NULL)270 { 271 if (fclose((FILE *)in Handle) != 0)269 if (in != NULL) 270 { 271 if (fclose((FILE *)in) != 0) 272 272 { 273 273 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_CLOSE, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); 274 274 } 275 275 276 in Handle= NULL;277 } 278 279 if (out Handle!= NULL)280 { 281 if (fclose((FILE *)out Handle) != 0)276 in = NULL; 277 } 278 279 if (out != NULL) 280 { 281 if (fclose((FILE *)out) != 0) 282 282 { 283 283 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_CLOSE, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); 284 284 } 285 285 286 out Handle= NULL;286 out = NULL; 287 287 } 288 288 … … 304 304 #endif 305 305 306 if (in Handle!= NULL)307 { 308 if (fclose((FILE *)in Handle) != 0)306 if (in != NULL) 307 { 308 if (fclose((FILE *)in) != 0) 309 309 { 310 310 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_OPEN, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); 311 311 } 312 312 313 in Handle= NULL;314 } 315 316 if (out Handle!= NULL)317 { 318 if (fclose((FILE *)out Handle) != 0)313 in = NULL; 314 } 315 316 if (out != NULL) 317 { 318 if (fclose((FILE *)out) != 0) 319 319 { 320 320 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_OPEN, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); 321 321 } 322 322 323 out Handle= NULL;323 out = NULL; 324 324 } 325 325 … … 331 331 } 332 332 333 in Handle= fdopen(pipefd[0], "r");334 if (in Handle== NULL)333 in = fdopen(pipefd[0], "r"); 334 if (in == NULL) 335 335 { 336 336 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_OPEN, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); 337 337 } 338 338 339 out Handle= fdopen(pipefd[1], "w");340 if (out Handle== NULL)339 out = fdopen(pipefd[1], "w"); 340 if (out == NULL) 341 341 { 342 342 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_OPEN, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); … … 353 353 io::pipe::_read(char * const a_data) 354 354 { 355 if (in Handle== NULL)355 if (in == NULL) 356 356 { 357 357 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX__READ, exception::ERRNO_LIBDODO, PIPEEX_PIPENOTOPENED, IOPIPEEX_NOTOPENED_STR, __LINE__, __FILE__); … … 374 374 while (true) 375 375 { 376 if ((n = fread(data, 1, batch, (FILE *)in Handle)) == 0)376 if ((n = fread(data, 1, batch, (FILE *)in)) == 0) 377 377 { 378 if (feof((FILE *)in Handle) != 0 || errno == EAGAIN)378 if (feof((FILE *)in) != 0 || errno == EAGAIN) 379 379 { 380 380 break; … … 386 386 } 387 387 388 if (ferror((FILE *)in Handle) != 0)388 if (ferror((FILE *)in) != 0) 389 389 { 390 390 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX__READ, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); … … 407 407 while (true) 408 408 { 409 if ((n = fread(data, 1, batch, (FILE *)in Handle)) == 0)409 if ((n = fread(data, 1, batch, (FILE *)in)) == 0) 410 410 { 411 if (feof((FILE *)in Handle) != 0 || errno == EAGAIN)411 if (feof((FILE *)in) != 0 || errno == EAGAIN) 412 412 { 413 413 break; … … 419 419 } 420 420 421 if (ferror((FILE *)in Handle) != 0)421 if (ferror((FILE *)in) != 0) 422 422 { 423 423 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX__READ, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); … … 439 439 io::pipe::_write(const char *const buf) 440 440 { 441 if (out Handle== NULL)441 if (out == NULL) 442 442 { 443 443 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX__WRITE, exception::ERRNO_LIBDODO, PIPEEX_PIPENOTOPENED, IOPIPEEX_NOTOPENED_STR, __LINE__, __FILE__); … … 458 458 while (true) 459 459 { 460 if ((n = fwrite(data, 1, batch, (FILE *)out Handle)) == 0)460 if ((n = fwrite(data, 1, batch, (FILE *)out)) == 0) 461 461 { 462 462 if (errno == EINTR) … … 470 470 } 471 471 472 if (ferror((FILE *)out Handle) != 0)472 if (ferror((FILE *)out) != 0) 473 473 { 474 474 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX__WRITE, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); … … 491 491 while (true) 492 492 { 493 if ((n = fwrite(data, 1, batch, (FILE *)out Handle)) == 0)493 if ((n = fwrite(data, 1, batch, (FILE *)out)) == 0) 494 494 { 495 495 if (errno == EINTR) … … 503 503 } 504 504 505 if (ferror((FILE *)out Handle) != 0)505 if (ferror((FILE *)out) != 0) 506 506 { 507 507 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX__WRITE, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); … … 525 525 pc::sync::protector pg(keeper); 526 526 527 if (out Handle== NULL)527 if (out == NULL) 528 528 { 529 529 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_FLUSH, exception::ERRNO_LIBDODO, PIPEEX_PIPENOTOPENED, IOPIPEEX_NOTOPENED_STR, __LINE__, __FILE__); 530 530 } 531 531 532 if (fflush((FILE *)out Handle) != 0)532 if (fflush((FILE *)out) != 0) 533 533 { 534 534 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_FLUSH, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); … … 543 543 pc::sync::protector pg(keeper); 544 544 545 if (in Handle== NULL)545 if (in == NULL) 546 546 { 547 547 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_PEERINFO, exception::ERRNO_LIBDODO, PIPEEX_PIPENOTOPENED, IOPIPEEX_NOTOPENED_STR, __LINE__, __FILE__); … … 554 554 socklen_t len = sizeof(sockaddr_in6); 555 555 556 int desc = fileno((FILE *)in Handle);556 int desc = fileno((FILE *)in); 557 557 if (desc == -1) 558 558 { … … 627 627 pc::sync::protector pg(keeper); 628 628 629 if (in Handle == NULL && outHandle== NULL)629 if (in == NULL && out == NULL) 630 630 { 631 631 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX_BLOCK, exception::ERRNO_LIBDODO, PIPEEX_PIPENOTOPENED, IOPIPEEX_NOTOPENED_STR, __LINE__, __FILE__); … … 640 640 int desc; 641 641 642 desc = fileno((FILE *)in Handle);642 desc = fileno((FILE *)in); 643 643 if (desc == -1) 644 644 { … … 666 666 } 667 667 668 desc = fileno((FILE *)out Handle);668 desc = fileno((FILE *)out); 669 669 if (desc == -1) 670 670 { … … 700 700 io::pipe::_readStream(char * const a_data) 701 701 { 702 if (in Handle== NULL)702 if (in == NULL) 703 703 { 704 704 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX__READSTREAM, exception::ERRNO_LIBDODO, PIPEEX_PIPENOTOPENED, IOPIPEEX_NOTOPENED_STR, __LINE__, __FILE__); … … 711 711 while (true) 712 712 { 713 if (fgets(a_data, readSize, (FILE *)in Handle) == NULL)713 if (fgets(a_data, readSize, (FILE *)in) == NULL) 714 714 { 715 715 if (errno == EINTR) … … 723 723 } 724 724 725 if (ferror((FILE *)in Handle) != 0)725 if (ferror((FILE *)in) != 0) 726 726 { 727 727 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX__READSTREAM, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); … … 755 755 while (true) 756 756 { 757 if (fputc('\n', (FILE *)out Handle) == EOF)757 if (fputc('\n', (FILE *)out) == EOF) 758 758 { 759 759 if (errno == EINTR) … … 767 767 } 768 768 769 if (ferror((FILE *)out Handle) != 0)769 if (ferror((FILE *)out) != 0) 770 770 { 771 771 throw exception::basic(exception::ERRMODULE_IOPIPE, PIPEEX__WRITESTREAM, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__); -
trunk/src/ioSsl.inline
r1188 r1189 40 40 { 41 41 /** 42 * @struct __ssl Handle42 * @struct __sslConnection 43 43 * @brief defines internal handlers for SSL 44 44 */ 45 struct __ssl Handle45 struct __sslConnection 46 46 { 47 47 SSL *handle; ///< SSL connection handle -
trunk/src/ioStdio.cc
r1166 r1189 41 41 #endif 42 42 43 in Handle= stdin;44 out Handle= stdout;43 in = stdin; 44 out = stdout; 45 45 } 46 46 … … 85 85 if (err) 86 86 { 87 out Handle= stderr;87 out = stderr; 88 88 } 89 89 else 90 90 { 91 out Handle= stdout;91 out = stdout; 92 92 } 93 93 } -
trunk/src/pcSyncProcessDataSingle.cc
r1188 r1189 40 40 #include <time.h> 41 41 42 #include "pcSyncProcess Semaphore.inline"42 #include "pcSyncProcessLock.inline" 43 43 44 44 #include <libdodo/pcSyncProcessDataSingle.h> … … 60 60 autogenerated(false), 61 61 acquired(false), 62 semaphore(new pc::sync::process::__ semaphoreHandle)62 semaphore(new pc::sync::process::__lock) 63 63 { 64 64 #ifdef XSI_IPC … … 122 122 autogenerated(false), 123 123 acquired(false), 124 semaphore(new pc::sync::process::__ semaphoreHandle)124 semaphore(new pc::sync::process::__lock) 125 125 { 126 126 } -
trunk/src/pcSyncProcessLock.inline
r1188 r1189 1 1 /*************************************************************************** 2 * pcSyncProcess Semaphore.inline2 * pcSyncProcessLock.inline 3 3 * 4 4 * Sat Mar 21 02:36:14 2009 … … 49 49 { 50 50 /** 51 * @struct __ semaphoreHandle51 * @struct __lock 52 52 * @brief defines system semaphore 53 53 */ 54 struct __ semaphoreHandle54 struct __lock 55 55 { 56 56 /** 57 57 * constructor 58 58 */ 59 __ semaphoreHandle() :59 __lock() : 60 60 #ifdef XSI_IPC 61 61 keeper(-1) -
trunk/src/pcSyncProcessSection.cc
r1188 r1189 38 38 #endif 39 39 40 #include "pcSyncProcess Semaphore.inline"40 #include "pcSyncProcessLock.inline" 41 41 42 42 #include <libdodo/pcSyncProcessSection.h> … … 57 57 section::section(int a_key) : autogenerated(false), 58 58 acquired(false), 59 semaphore(new __ semaphoreHandle)59 semaphore(new __lock) 60 60 { 61 61 #ifdef XSI_IPC … … 119 119 section::section() : autogenerated(false), 120 120 acquired(false), 121 semaphore(new __ semaphoreHandle)121 semaphore(new __lock) 122 122 { 123 123 } -
trunk/src/rpcXmlClient.cc
r1188 r1189 77 77 rpEncoding = xmlValue.getBufferInfo(data).encoding; 78 78 79 dodo::data::format::xml::__node HandleDef xmlMethodResponse;79 dodo::data::format::xml::__nodeDef xmlMethodResponse; 80 80 xmlMethodResponse.name = "methodResponse"; 81 81 xmlMethodResponse.allChildren = true; -
trunk/src/rpcXmlServer.cc
r1188 r1189 65 65 rqEncoding = xmlValue.getBufferInfo(data).encoding; 66 66 67 dodo::data::format::xml::__node HandleDef xmlMethodCall;67 dodo::data::format::xml::__nodeDef xmlMethodCall; 68 68 xmlMethodCall.name = "methodCall"; 69 69 xmlMethodCall.allChildren = true;
Note: See TracChangeset
for help on using the changeset viewer.
