Changeset 524 for branches/PublicaMundi_David-devel
- Timestamp:
- Nov 4, 2014, 9:34:34 AM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/PublicaMundi_David-devel/zoo-project/zoo-kernel/zoo_service_loader.c
r513 r524 1216 1216 1217 1217 s1 = NULL; 1218 s1 = (service *) malloc (SERVICE_SIZE);1218 /**s1 = (service *) malloc (SERVICE_SIZE); 1219 1219 if (s1 == NULL) 1220 1220 { … … 1231 1231 else 1232 1232 snprintf (tmps1, 1024, "%s/", ntmp); 1233 **/ 1233 1234 r_inputs = getMap (request_inputs, "Identifier"); 1235 /** 1234 1236 char *ttmp = zStrdup (tmps1); 1235 1237 snprintf (tmps1, 1024, "%s/%s.zcfg", ttmp, r_inputs->value); … … 1253 1255 t = readServiceFile (m, tmps1, &s1, r_inputs->value); 1254 1256 fflush (stdout); 1257 **/ 1258 int saved_stdout = dup (fileno (stdout)); 1255 1259 dup2 (saved_stdout, fileno (stdout)); 1256 if (t < 0) 1260 s1 = search_service (r_inputs->value); 1261 if (s1 == NULL) 1257 1262 { 1258 1263 char *tmpMsg = (char *) malloc (2048 + strlen (r_inputs->value)); … … 1454 1459 free (SERVICE_URL); 1455 1460 InternetCloseHandle (&hInternet); 1456 freeService (&s1);1461 //freeService (&s1); 1457 1462 free (s1); 1458 1463 return 0; … … 1618 1623 free (SERVICE_URL); 1619 1624 InternetCloseHandle (&hInternet); 1620 freeService (&s1);1625 //freeService (&s1); 1621 1626 free (s1); 1622 1627 return 0; … … 1640 1645 free (SERVICE_URL); 1641 1646 InternetCloseHandle (&hInternet); 1642 freeService (&s1);1647 //freeService (&s1); 1643 1648 free (s1); 1644 1649 return 0; … … 1675 1680 free (SERVICE_URL); 1676 1681 InternetCloseHandle (&hInternet); 1677 freeService (&s1);1682 //freeService (&s1); 1678 1683 free (s1); 1679 1684 return 0; … … 1744 1749 { 1745 1750 xmlChar *val = xmlNodeListGetString (doc, 1746 cur2->xmlChildrenNode, 1751 cur2-> 1752 xmlChildrenNode, 1747 1753 1); 1748 1754 if (tmpmaps == NULL) … … 1773 1779 { 1774 1780 xmlChar *val = xmlNodeListGetString (doc, 1775 cur2->xmlChildrenNode, 1781 cur2-> 1782 xmlChildrenNode, 1776 1783 1); 1777 1784 if (tmpmaps == NULL) … … 1785 1792 "InternalError", NULL); 1786 1793 } 1787 tmpmaps->name = zStrdup ("missingInde tifier");1794 tmpmaps->name = zStrdup ("missingIndentifier"); 1788 1795 tmpmaps->content = 1789 1796 createMap ((char *) cur2->name, (char *) val); … … 1858 1865 free (SERVICE_URL); 1859 1866 InternetCloseHandle (&hInternet); 1860 freeService (&s1);1867 //freeService (&s1); 1861 1868 free (s1); 1862 1869 return 0; … … 2209 2216 { 2210 2217 xmlChar *mv = xmlNodeListGetString (doc, 2211 cur4-> 2212 xmlChildrenNode, 2218 cur4->xmlChildrenNode, 2213 2219 1); 2214 2220 map *ltmp = getMap (tmpmaps->content, … … 2256 2262 { 2257 2263 xmlChar *tmp = xmlNodeListGetRawString (doc, 2258 cur4-> 2259 xmlChildrenNode, 2264 cur4->xmlChildrenNode, 2260 2265 0); 2261 2266 addToMap (tmpmaps->content, … … 2325 2330 free (SERVICE_URL); 2326 2331 InternetCloseHandle (&hInternet); 2327 freeService (&s1);2332 //freeService (&s1); 2328 2333 free (s1); 2329 2334 return 0; … … 2424 2429 { 2425 2430 xmlChar *val = xmlNodeListGetString (NULL, 2426 cur2->xmlChildrenNode, 2431 cur2-> 2432 xmlChildrenNode, 2427 2433 1); 2428 2434 free (tmpmaps->name); … … 2511 2517 { 2512 2518 xmlChar *val = xmlNodeListGetString (doc, 2513 cur1->xmlChildrenNode, 2519 cur1-> 2520 xmlChildrenNode, 2514 2521 1); 2515 2522 if (tmpmaps == NULL) … … 2571 2578 { 2572 2579 xmlChar *val = xmlNodeListGetString (doc, 2573 cur1->xmlChildrenNode, 2580 cur1-> 2581 xmlChildrenNode, 2574 2582 1); 2575 2583 if (tmpmaps == NULL) … … 2647 2655 { 2648 2656 xmlChar *val = xmlNodeListGetString (doc, 2649 cur2-> 2650 xmlChildrenNode, 2657 cur2->xmlChildrenNode, 2651 2658 1); 2652 2659 if (tmpmaps == NULL) … … 2688 2695 { 2689 2696 xmlChar *val = xmlNodeListGetString (doc, 2690 cur2-> 2691 xmlChildrenNode, 2697 cur2->xmlChildrenNode, 2692 2698 1); 2693 2699 if (tmpmaps == NULL) … … 2790 2796 addToMap (tmpe, "text", tmps); 2791 2797 printExceptionReportResponse (m, tmpe); 2792 freeService (&s1);2798 //freeService (&s1); 2793 2799 free (s1); 2794 2800 freeMap (&tmpe); … … 2834 2840 addToMap (tmpe, "text", tmps); 2835 2841 printExceptionReportResponse (m, tmpe); 2836 freeService (&s1);2842 //freeService (&s1); 2837 2843 free (s1); 2838 2844 freeMap (&tmpe); … … 3020 3026 ("Status cannot be set to true with storeExecuteResponse to false. Please, modify your request parameters."), 3021 3027 "InvalidParameterValue", "storeExecuteResponse"); 3022 freeService (&s1);3028 //freeService (&s1); 3023 3029 free (s1); 3024 3030 freeMaps (&m); … … 3342 3348 } 3343 3349 3344 freeService (&s1);3350 //freeService (&s1); 3345 3351 free (s1); 3346 3352 freeMaps (&m);
Note: See TracChangeset
for help on using the changeset viewer.
