comparison: src/server/webdav/saxhandler.cpp
src/server/webdav/saxhandler.cpp
- changeset 48
- 37a512d7b8f6
- parent 44
- 3da1f7b6847f
- child 50
- 4d39adda7a38
equal
deleted
inserted
replaced
| 47:ce9790523346 | 48:37a512d7b8f6 |
|---|---|
| 76 char *name = XMLString::transcode(localname); | 76 char *name = XMLString::transcode(localname); |
| 77 | 77 |
| 78 if(!strcmp(ns, "DAV:") && !strcmp(name, "prop")) { | 78 if(!strcmp(ns, "DAV:") && !strcmp(name, "prop")) { |
| 79 davPropTag = true; | 79 davPropTag = true; |
| 80 } else if(davPropTag && property == NULL) { | 80 } else if(davPropTag && property == NULL) { |
| 81 //property = (DavProperty*)pool_malloc(pool, sizeof(DavProperty)); | 81 property = (DavProperty*)pool_malloc(pool, sizeof(DavProperty)); |
| 82 property = (DavProperty*)malloc(sizeof(DavProperty)); | 82 //property = (DavProperty*)malloc(sizeof(DavProperty)); |
| 83 /* Ultra TODO: pool_malloc makes big mistakes!! */ | 83 /* TODO: pool_malloc makes big mistakes!! */ |
| 84 // Fixed or not? It works | |
| 84 | 85 |
| 85 size_t nslen = strlen(ns); | 86 size_t nslen = strlen(ns); |
| 86 size_t namelen = strlen(name); | 87 size_t namelen = strlen(name); |
| 87 if(nslen > 0) { | 88 if(nslen > 0) { |
| 88 property->xmlns = (char*)pool_malloc(pool, nslen + 1); | 89 property->xmlns = (char*)pool_malloc(pool, nslen + 1); |
| 156 | 157 |
| 157 updateMode = -1; | 158 updateMode = -1; |
| 158 } | 159 } |
| 159 | 160 |
| 160 ProppatchHandler::~ProppatchHandler() { | 161 ProppatchHandler::~ProppatchHandler() { |
| 161 | 162 ucx_dlist_free(xmlStack); |
| 162 } | 163 } |
| 163 | 164 |
| 164 void ProppatchHandler::startElement( | 165 void ProppatchHandler::startElement( |
| 165 const XMLCh *const uri, | 166 const XMLCh *const uri, |
| 166 const XMLCh* const localname, | 167 const XMLCh* const localname, |
