comparison: ui/common/properties.c
ui/common/properties.c
- changeset 1016
- ccde46662db7
- parent 1014
- 83c83a7aa552
equal
deleted
inserted
replaced
| 1015:b459361d98ad | 1016:ccde46662db7 |
|---|---|
| 99 if(!appname) { | 99 if(!appname) { |
| 100 return NULL; | 100 return NULL; |
| 101 } | 101 } |
| 102 | 102 |
| 103 CxBuffer buf; | 103 CxBuffer buf; |
| 104 cxBufferInit(&buf, NULL, 128, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); | 104 cxBufferInit(&buf, cxDefaultAllocator, NULL, 128, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); |
| 105 | 105 |
| 106 // add base dir | 106 // add base dir |
| 107 char *homeenv = getenv(UI_ENV_HOME); | 107 char *homeenv = getenv(UI_ENV_HOME); |
| 108 if(homeenv == NULL) { | 108 if(homeenv == NULL) { |
| 109 cxBufferDestroy(&buf); | 109 cxBufferDestroy(&buf); |
| 334 | 334 |
| 335 | 335 |
| 336 static char* uic_concat_path(const char *base, const char *p, const char *ext) { | 336 static char* uic_concat_path(const char *base, const char *p, const char *ext) { |
| 337 size_t baselen = strlen(base); | 337 size_t baselen = strlen(base); |
| 338 | 338 |
| 339 CxBuffer *buf = cxBufferCreate(NULL, 32, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); | 339 CxBuffer *buf = cxBufferCreate(cxDefaultAllocator, NULL, 32, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); |
| 340 if(baselen > 0) { | 340 if(baselen > 0) { |
| 341 cxBufferWrite(base, 1, baselen, buf); | 341 cxBufferWrite(base, 1, baselen, buf); |
| 342 if(base[baselen - 1] != '/') { | 342 if(base[baselen - 1] != '/') { |
| 343 cxBufferPut(buf, '/'); | 343 cxBufferPut(buf, '/'); |
| 344 } | 344 } |
