Changeset 13739
- Timestamp:
- Jun 8, 2007, 5:40:47 PM (19 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
-
dbconfig/config.md (modified) (1 diff)
-
ippTools/configure.ac (modified) (2 diffs)
-
ippdb/configure.ac (modified) (1 diff)
-
ippdb/src/ippdb.c (modified) (30 diffs)
-
ippdb/src/ippdb.h (modified) (9 diffs)
-
ippdb/tests/alloc.c (modified) (6 diffs)
-
ippdb/tests/insert.c (modified) (3 diffs)
-
ippdb/tests/insertobject.c (modified) (3 diffs)
-
ippdb/tests/metadatafromobject.c (modified) (6 diffs)
-
ippdb/tests/objectfrommetadata.c (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/dbconfig/config.md
r13649 r13739 2 2 pkg_name STR ippdb 3 3 pkg_namespace STR ippdb 4 pkg_version STR 1.1.2 14 pkg_version STR 1.1.22 5 5 END -
trunk/ippTools/configure.ac
r13649 r13739 1 1 AC_PREREQ(2.59) 2 2 3 AC_INIT([ipptools], [1.1.2 1], [ipp-support@ifa.hawaii.edu])3 AC_INIT([ipptools], [1.1.22], [ipp-support@ifa.hawaii.edu]) 4 4 AC_CONFIG_SRCDIR([autogen.sh]) 5 5 … … 18 18 PKG_CHECK_MODULES([PSLIB], [pslib >= 1.1.0]) 19 19 PKG_CHECK_MODULES([PSMODULES], [psmodules >= 1.1.0]) 20 PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.2 1])20 PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.22]) 21 21 22 22 PXTOOLS_CFLAGS="${PSLIB_CFLAGS=} ${PSMODULES_CFLAGS=} ${IPPDB_CFLAGS=}" -
trunk/ippdb/configure.ac
r13649 r13739 7 7 AC_PREREQ(2.59) 8 8 9 AC_INIT([ippdb], [1.1.2 1], [pan-starrs.ifa.hawaii.edu])9 AC_INIT([ippdb], [1.1.22], [pan-starrs.ifa.hawaii.edu]) 10 10 AC_CONFIG_SRCDIR([ippdb.pc.in]) 11 11 -
trunk/ippdb/src/ippdb.c
r13649 r13739 10221 10221 static void warpSkyfileRowFree(warpSkyfileRow *object); 10222 10222 10223 warpSkyfileRow *warpSkyfileRowAlloc(psS64 warp_id, const char *skycell_id, const char *tess_id, const char *uri, psF64 bg, psF64 bg_stdev)10223 warpSkyfileRow *warpSkyfileRowAlloc(psS64 warp_id, const char *skycell_id, const char *tess_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev) 10224 10224 { 10225 10225 warpSkyfileRow *_object; … … 10232 10232 _object->tess_id = psStringCopy(tess_id); 10233 10233 _object->uri = psStringCopy(uri); 10234 _object->path_base = psStringCopy(path_base); 10234 10235 _object->bg = bg; 10235 10236 _object->bg_stdev = bg_stdev; … … 10243 10244 psFree(object->tess_id); 10244 10245 psFree(object->uri); 10246 psFree(object->path_base); 10245 10247 } 10246 10248 … … 10268 10270 return false; 10269 10271 } 10272 if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, "255")) { 10273 psError(PS_ERR_UNKNOWN, false, "failed to add item path_base"); 10274 psFree(md); 10275 return false; 10276 } 10270 10277 if (!psMetadataAdd(md, PS_LIST_TAIL, "bg", PS_DATA_F64, NULL, 0.0)) { 10271 10278 psError(PS_ERR_UNKNOWN, false, "failed to add item bg"); … … 10291 10298 } 10292 10299 10293 bool warpSkyfileInsert(psDB * dbh, psS64 warp_id, const char *skycell_id, const char *tess_id, const char *uri, psF64 bg, psF64 bg_stdev)10300 bool warpSkyfileInsert(psDB * dbh, psS64 warp_id, const char *skycell_id, const char *tess_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev) 10294 10301 { 10295 10302 psMetadata *md = psMetadataAlloc(); … … 10311 10318 if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, uri)) { 10312 10319 psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); 10320 psFree(md); 10321 return false; 10322 } 10323 if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, path_base)) { 10324 psError(PS_ERR_UNKNOWN, false, "failed to add item path_base"); 10313 10325 psFree(md); 10314 10326 return false; … … 10347 10359 bool warpSkyfileInsertObject(psDB *dbh, warpSkyfileRow *object) 10348 10360 { 10349 return warpSkyfileInsert(dbh, object->warp_id, object->skycell_id, object->tess_id, object->uri, object-> bg, object->bg_stdev);10361 return warpSkyfileInsert(dbh, object->warp_id, object->skycell_id, object->tess_id, object->uri, object->path_base, object->bg, object->bg_stdev); 10350 10362 } 10351 10363 … … 10440 10452 return false; 10441 10453 } 10454 if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, object->path_base)) { 10455 psError(PS_ERR_UNKNOWN, false, "failed to add item path_base"); 10456 psFree(md); 10457 return false; 10458 } 10442 10459 if (!psMetadataAdd(md, PS_LIST_TAIL, "bg", PS_DATA_F64, NULL, object->bg)) { 10443 10460 psError(PS_ERR_UNKNOWN, false, "failed to add item bg"); … … 10479 10496 return false; 10480 10497 } 10498 char* path_base = psMetadataLookupPtr(&status, md, "path_base"); 10499 if (!status) { 10500 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item path_base"); 10501 return false; 10502 } 10481 10503 psF64 bg = psMetadataLookupF64(&status, md, "bg"); 10482 10504 if (!status) { … … 10490 10512 } 10491 10513 10492 return warpSkyfileRowAlloc(warp_id, skycell_id, tess_id, uri, bg, bg_stdev);10514 return warpSkyfileRowAlloc(warp_id, skycell_id, tess_id, uri, path_base, bg, bg_stdev); 10493 10515 } 10494 10516 psArray *warpSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 11388 11410 static void diffSkyfileRowFree(diffSkyfileRow *object); 11389 11411 11390 diffSkyfileRow *diffSkyfileRowAlloc(psS64 diff_id, const char *uri, psF64 bg, psF64 bg_stdev)11412 diffSkyfileRow *diffSkyfileRowAlloc(psS64 diff_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev) 11391 11413 { 11392 11414 diffSkyfileRow *_object; … … 11397 11419 _object->diff_id = diff_id; 11398 11420 _object->uri = psStringCopy(uri); 11421 _object->path_base = psStringCopy(path_base); 11399 11422 _object->bg = bg; 11400 11423 _object->bg_stdev = bg_stdev; … … 11406 11429 { 11407 11430 psFree(object->uri); 11431 psFree(object->path_base); 11408 11432 } 11409 11433 … … 11421 11445 return false; 11422 11446 } 11447 if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, "255")) { 11448 psError(PS_ERR_UNKNOWN, false, "failed to add item path_base"); 11449 psFree(md); 11450 return false; 11451 } 11423 11452 if (!psMetadataAdd(md, PS_LIST_TAIL, "bg", PS_DATA_F64, NULL, 0.0)) { 11424 11453 psError(PS_ERR_UNKNOWN, false, "failed to add item bg"); … … 11444 11473 } 11445 11474 11446 bool diffSkyfileInsert(psDB * dbh, psS64 diff_id, const char *uri, psF64 bg, psF64 bg_stdev)11475 bool diffSkyfileInsert(psDB * dbh, psS64 diff_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev) 11447 11476 { 11448 11477 psMetadata *md = psMetadataAlloc(); … … 11454 11483 if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, uri)) { 11455 11484 psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); 11485 psFree(md); 11486 return false; 11487 } 11488 if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, path_base)) { 11489 psError(PS_ERR_UNKNOWN, false, "failed to add item path_base"); 11456 11490 psFree(md); 11457 11491 return false; … … 11490 11524 bool diffSkyfileInsertObject(psDB *dbh, diffSkyfileRow *object) 11491 11525 { 11492 return diffSkyfileInsert(dbh, object->diff_id, object->uri, object-> bg, object->bg_stdev);11526 return diffSkyfileInsert(dbh, object->diff_id, object->uri, object->path_base, object->bg, object->bg_stdev); 11493 11527 } 11494 11528 … … 11573 11607 return false; 11574 11608 } 11609 if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, object->path_base)) { 11610 psError(PS_ERR_UNKNOWN, false, "failed to add item path_base"); 11611 psFree(md); 11612 return false; 11613 } 11575 11614 if (!psMetadataAdd(md, PS_LIST_TAIL, "bg", PS_DATA_F64, NULL, object->bg)) { 11576 11615 psError(PS_ERR_UNKNOWN, false, "failed to add item bg"); … … 11602 11641 return false; 11603 11642 } 11643 char* path_base = psMetadataLookupPtr(&status, md, "path_base"); 11644 if (!status) { 11645 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item path_base"); 11646 return false; 11647 } 11604 11648 psF64 bg = psMetadataLookupF64(&status, md, "bg"); 11605 11649 if (!status) { … … 11613 11657 } 11614 11658 11615 return diffSkyfileRowAlloc(diff_id, uri, bg, bg_stdev);11659 return diffSkyfileRowAlloc(diff_id, uri, path_base, bg, bg_stdev); 11616 11660 } 11617 11661 psArray *diffSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 12424 12468 static void stackSumSkyfileRowFree(stackSumSkyfileRow *object); 12425 12469 12426 stackSumSkyfileRow *stackSumSkyfileRowAlloc(psS64 stack_id, const char *uri, psF64 bg, psF64 bg_stdev)12470 stackSumSkyfileRow *stackSumSkyfileRowAlloc(psS64 stack_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev) 12427 12471 { 12428 12472 stackSumSkyfileRow *_object; … … 12433 12477 _object->stack_id = stack_id; 12434 12478 _object->uri = psStringCopy(uri); 12479 _object->path_base = psStringCopy(path_base); 12435 12480 _object->bg = bg; 12436 12481 _object->bg_stdev = bg_stdev; … … 12442 12487 { 12443 12488 psFree(object->uri); 12489 psFree(object->path_base); 12444 12490 } 12445 12491 … … 12457 12503 return false; 12458 12504 } 12505 if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, "255")) { 12506 psError(PS_ERR_UNKNOWN, false, "failed to add item path_base"); 12507 psFree(md); 12508 return false; 12509 } 12459 12510 if (!psMetadataAdd(md, PS_LIST_TAIL, "bg", PS_DATA_F64, NULL, 0.0)) { 12460 12511 psError(PS_ERR_UNKNOWN, false, "failed to add item bg"); … … 12480 12531 } 12481 12532 12482 bool stackSumSkyfileInsert(psDB * dbh, psS64 stack_id, const char *uri, psF64 bg, psF64 bg_stdev)12533 bool stackSumSkyfileInsert(psDB * dbh, psS64 stack_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev) 12483 12534 { 12484 12535 psMetadata *md = psMetadataAlloc(); … … 12490 12541 if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, uri)) { 12491 12542 psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); 12543 psFree(md); 12544 return false; 12545 } 12546 if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, path_base)) { 12547 psError(PS_ERR_UNKNOWN, false, "failed to add item path_base"); 12492 12548 psFree(md); 12493 12549 return false; … … 12526 12582 bool stackSumSkyfileInsertObject(psDB *dbh, stackSumSkyfileRow *object) 12527 12583 { 12528 return stackSumSkyfileInsert(dbh, object->stack_id, object->uri, object-> bg, object->bg_stdev);12584 return stackSumSkyfileInsert(dbh, object->stack_id, object->uri, object->path_base, object->bg, object->bg_stdev); 12529 12585 } 12530 12586 … … 12609 12665 return false; 12610 12666 } 12667 if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, object->path_base)) { 12668 psError(PS_ERR_UNKNOWN, false, "failed to add item path_base"); 12669 psFree(md); 12670 return false; 12671 } 12611 12672 if (!psMetadataAdd(md, PS_LIST_TAIL, "bg", PS_DATA_F64, NULL, object->bg)) { 12612 12673 psError(PS_ERR_UNKNOWN, false, "failed to add item bg"); … … 12638 12699 return false; 12639 12700 } 12701 char* path_base = psMetadataLookupPtr(&status, md, "path_base"); 12702 if (!status) { 12703 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item path_base"); 12704 return false; 12705 } 12640 12706 psF64 bg = psMetadataLookupF64(&status, md, "bg"); 12641 12707 if (!status) { … … 12649 12715 } 12650 12716 12651 return stackSumSkyfileRowAlloc(stack_id, uri, bg, bg_stdev);12717 return stackSumSkyfileRowAlloc(stack_id, uri, path_base, bg, bg_stdev); 12652 12718 } 12653 12719 psArray *stackSumSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) -
trunk/ippdb/src/ippdb.h
r13649 r13739 5133 5133 char *tess_id; 5134 5134 char *uri; 5135 char *path_base; 5135 5136 psF64 bg; 5136 5137 psF64 bg_stdev; … … 5147 5148 const char *tess_id, 5148 5149 const char *uri, 5150 const char *path_base, 5149 5151 psF64 bg, 5150 5152 psF64 bg_stdev … … 5182 5184 const char *tess_id, 5183 5185 const char *uri, 5186 const char *path_base, 5184 5187 psF64 bg, 5185 5188 psF64 bg_stdev … … 5764 5767 psS64 diff_id; 5765 5768 char *uri; 5769 char *path_base; 5766 5770 psF64 bg; 5767 5771 psF64 bg_stdev; … … 5776 5780 psS64 diff_id, 5777 5781 const char *uri, 5782 const char *path_base, 5778 5783 psF64 bg, 5779 5784 psF64 bg_stdev … … 5809 5814 psS64 diff_id, 5810 5815 const char *uri, 5816 const char *path_base, 5811 5817 psF64 bg, 5812 5818 psF64 bg_stdev … … 6379 6385 psS64 stack_id; 6380 6386 char *uri; 6387 char *path_base; 6381 6388 psF64 bg; 6382 6389 psF64 bg_stdev; … … 6391 6398 psS64 stack_id, 6392 6399 const char *uri, 6400 const char *path_base, 6393 6401 psF64 bg, 6394 6402 psF64 bg_stdev … … 6424 6432 psS64 stack_id, 6425 6433 const char *uri, 6434 const char *path_base, 6426 6435 psF64 bg, 6427 6436 psF64 bg_stdev -
trunk/ippdb/tests/alloc.c
r13649 r13739 1082 1082 warpSkyfileRow *object; 1083 1083 1084 object = warpSkyfileRowAlloc(-64, "a string", "a string", "a string", 64.64, 64.64 );1084 object = warpSkyfileRowAlloc(-64, "a string", "a string", "a string", "a string", 64.64, 64.64 ); 1085 1085 1086 1086 if (!object) { … … 1104 1104 exit(EXIT_FAILURE); 1105 1105 } 1106 if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { 1107 psFree(object); 1108 exit(EXIT_FAILURE); 1109 } 1106 1110 if (!object->bg == 64.64) { 1107 1111 psFree(object); … … 1196 1200 diffSkyfileRow *object; 1197 1201 1198 object = diffSkyfileRowAlloc(-64, "a string", 64.64, 64.64 );1202 object = diffSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64 ); 1199 1203 1200 1204 if (!object) { … … 1210 1214 exit(EXIT_FAILURE); 1211 1215 } 1216 if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { 1217 psFree(object); 1218 exit(EXIT_FAILURE); 1219 } 1212 1220 if (!object->bg == 64.64) { 1213 1221 psFree(object); … … 1286 1294 stackSumSkyfileRow *object; 1287 1295 1288 object = stackSumSkyfileRowAlloc(-64, "a string", 64.64, 64.64 );1296 object = stackSumSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64 ); 1289 1297 1290 1298 if (!object) { … … 1297 1305 } 1298 1306 if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { 1307 psFree(object); 1308 exit(EXIT_FAILURE); 1309 } 1310 if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { 1299 1311 psFree(object); 1300 1312 exit(EXIT_FAILURE); -
trunk/ippdb/tests/insert.c
r13649 r13739 358 358 } 359 359 360 if (!warpSkyfileInsert(dbh, -64, "a string", "a string", "a string", 64.64, 64.64)) {360 if (!warpSkyfileInsert(dbh, -64, "a string", "a string", "a string", "a string", 64.64, 64.64)) { 361 361 exit(EXIT_FAILURE); 362 362 } … … 403 403 } 404 404 405 if (!diffSkyfileInsert(dbh, -64, "a string", 64.64, 64.64)) {405 if (!diffSkyfileInsert(dbh, -64, "a string", "a string", 64.64, 64.64)) { 406 406 exit(EXIT_FAILURE); 407 407 } … … 448 448 } 449 449 450 if (!stackSumSkyfileInsert(dbh, -64, "a string", 64.64, 64.64)) {450 if (!stackSumSkyfileInsert(dbh, -64, "a string", "a string", 64.64, 64.64)) { 451 451 exit(EXIT_FAILURE); 452 452 } -
trunk/ippdb/tests/insertobject.c
r13649 r13739 520 520 } 521 521 522 object = warpSkyfileRowAlloc(-64, "a string", "a string", "a string", 64.64, 64.64);522 object = warpSkyfileRowAlloc(-64, "a string", "a string", "a string", "a string", 64.64, 64.64); 523 523 if (!object) { 524 524 exit(EXIT_FAILURE); … … 586 586 } 587 587 588 object = diffSkyfileRowAlloc(-64, "a string", 64.64, 64.64);588 object = diffSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64); 589 589 if (!object) { 590 590 exit(EXIT_FAILURE); … … 652 652 } 653 653 654 object = stackSumSkyfileRowAlloc(-64, "a string", 64.64, 64.64);654 object = stackSumSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64); 655 655 if (!object) { 656 656 exit(EXIT_FAILURE); -
trunk/ippdb/tests/metadatafromobject.c
r13649 r13739 1246 1246 bool status; 1247 1247 1248 object = warpSkyfileRowAlloc(-64, "a string", "a string", "a string", 64.64, 64.64);1248 object = warpSkyfileRowAlloc(-64, "a string", "a string", "a string", "a string", 64.64, 64.64); 1249 1249 if (!object) { 1250 1250 exit(EXIT_FAILURE); … … 1273 1273 exit(EXIT_FAILURE); 1274 1274 } 1275 if (strncmp(psMetadataLookupPtr(&status, md, "path_base"), "a string", MAX_STRING_LENGTH)) { 1276 psFree(md); 1277 exit(EXIT_FAILURE); 1278 } 1275 1279 if (!psMetadataLookupF64(&status, md, "bg") == 64.64) { 1276 1280 psFree(md); … … 1380 1384 bool status; 1381 1385 1382 object = diffSkyfileRowAlloc(-64, "a string", 64.64, 64.64);1386 object = diffSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64); 1383 1387 if (!object) { 1384 1388 exit(EXIT_FAILURE); … … 1399 1403 exit(EXIT_FAILURE); 1400 1404 } 1405 if (strncmp(psMetadataLookupPtr(&status, md, "path_base"), "a string", MAX_STRING_LENGTH)) { 1406 psFree(md); 1407 exit(EXIT_FAILURE); 1408 } 1401 1409 if (!psMetadataLookupF64(&status, md, "bg") == 64.64) { 1402 1410 psFree(md); … … 1490 1498 bool status; 1491 1499 1492 object = stackSumSkyfileRowAlloc(-64, "a string", 64.64, 64.64);1500 object = stackSumSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64); 1493 1501 if (!object) { 1494 1502 exit(EXIT_FAILURE); … … 1506 1514 } 1507 1515 if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { 1516 psFree(md); 1517 exit(EXIT_FAILURE); 1518 } 1519 if (strncmp(psMetadataLookupPtr(&status, md, "path_base"), "a string", MAX_STRING_LENGTH)) { 1508 1520 psFree(md); 1509 1521 exit(EXIT_FAILURE); -
trunk/ippdb/tests/objectfrommetadata.c
r13649 r13739 1942 1942 exit(EXIT_FAILURE); 1943 1943 } 1944 if (!psMetadataAddStr(md, PS_LIST_TAIL, "path_base", 0, NULL, "a string")) { 1945 psFree(md); 1946 exit(EXIT_FAILURE); 1947 } 1944 1948 if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg", 0, NULL, 64.64)) { 1945 1949 psFree(md); … … 1974 1978 exit(EXIT_FAILURE); 1975 1979 } 1980 if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { 1981 psFree(object); 1982 exit(EXIT_FAILURE); 1983 } 1976 1984 if (!object->bg == 64.64) { 1977 1985 psFree(object); … … 2130 2138 exit(EXIT_FAILURE); 2131 2139 } 2140 if (!psMetadataAddStr(md, PS_LIST_TAIL, "path_base", 0, NULL, "a string")) { 2141 psFree(md); 2142 exit(EXIT_FAILURE); 2143 } 2132 2144 if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg", 0, NULL, 64.64)) { 2133 2145 psFree(md); … … 2154 2166 exit(EXIT_FAILURE); 2155 2167 } 2168 if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { 2169 psFree(object); 2170 exit(EXIT_FAILURE); 2171 } 2156 2172 if (!object->bg == 64.64) { 2157 2173 psFree(object); … … 2278 2294 exit(EXIT_FAILURE); 2279 2295 } 2296 if (!psMetadataAddStr(md, PS_LIST_TAIL, "path_base", 0, NULL, "a string")) { 2297 psFree(md); 2298 exit(EXIT_FAILURE); 2299 } 2280 2300 if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg", 0, NULL, 64.64)) { 2281 2301 psFree(md); … … 2299 2319 } 2300 2320 if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { 2321 psFree(object); 2322 exit(EXIT_FAILURE); 2323 } 2324 if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { 2301 2325 psFree(object); 2302 2326 exit(EXIT_FAILURE);
Note:
See TracChangeset
for help on using the changeset viewer.
