Changeset 1326 for trunk/lang
- Timestamp:
- Mar 14, 2009, 4:51:26 PM (16 years ago)
- Location:
- trunk/lang
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lang/python/Rappture/PyRpEncode.cc
r1088 r1326 1 1 2 /* 2 3 * Rappture Encode Python Interface … … 28 29 PyObject* rv = NULL; 29 30 30 static char *kwlist[] = {"data", NULL}; 31 static char *kwlist[] = { 32 (char *)"data", 33 NULL 34 }; 31 35 32 36 if (PyTuple_Size(args) != 1) { … … 61 65 Rappture::Outcome err; 62 66 Rappture::Buffer buf; 63 std::string outStr;64 67 65 static char *kwlist[] = {"data", "flags", NULL}; 68 static char *kwlist[] = { 69 (char *)"data", 70 (char *)"flags", 71 NULL 72 }; 66 73 67 74 if (PyTuple_Size(args) != 2) { … … 79 86 err &= Rappture::encoding::encode(buf,flags); 80 87 if (int(err) != 0) { 81 outStr = err.remark() + "\n" + err.context(); 88 std::string outStr; 89 90 outStr = err.remark(); 91 outStr += "\n"; 92 outStr += err.context(); 82 93 PyErr_SetString(PyExc_RuntimeError,outStr.c_str()); 83 94 buf.clear(); … … 105 116 Rappture::Outcome err; 106 117 Rappture::Buffer buf; 107 std::string outStr;108 118 109 static char *kwlist[] = {"data", "flags", NULL}; 119 static char *kwlist[] = { 120 (char *)"data", 121 (char *)"flags", 122 NULL 123 }; 110 124 111 125 if (PyTuple_Size(args) != 2) { … … 123 137 err &= Rappture::encoding::decode(buf,flags); 124 138 if (int(err) != 0) { 125 outStr = err.remark() + "\n" + err.context(); 139 std::string outStr; 140 141 outStr = err.remark(); 142 outStr += "\n"; 143 outStr += err.context(); 126 144 PyErr_SetString(PyExc_RuntimeError,outStr.c_str()); 127 145 return NULL; … … 163 181 164 182 if (ErrorObject == NULL) { 165 ErrorObject = PyErr_NewException("Rappture.encoding.error", NULL, NULL); 166 if (ErrorObject == NULL) 183 ErrorObject = PyErr_NewException((char *)"Rappture.encoding.error", 184 NULL, NULL); 185 if (ErrorObject == NULL) { 167 186 return; 187 } 168 188 } 169 189 Py_INCREF(ErrorObject); -
trunk/lang/python/Rappture/PyRpLibrary.cc
r1039 r1326 1 1 2 /* 2 3 * ====================================================================== … … 171 172 RpLibraryObject_copy(RpLibraryObject *self, PyObject *args, PyObject *keywds) 172 173 { 173 char *topath = "";174 char *frompath = "";174 char *topath = (char *)""; 175 char *frompath = (char *)""; 175 176 int argc = 0; 176 177 int status = 0; 177 178 PyObject *fromobj = (PyObject *) self; 178 179 179 static char *kwlist[] = {"topath","frompath","fromobj", NULL}; 180 static char *kwlist[] = { 181 (char *)"topath", 182 (char *)"frompath", 183 (char *)"fromobj", 184 NULL 185 }; 180 186 181 187 if (self->lib == NULL) { … … 249 255 RpLibraryObject_element(RpLibraryObject *self, PyObject *args, PyObject *keywds) 250 256 { 251 char* path = "";252 char* as = "object";257 char* path = (char *)""; 258 char* as = (char *)"object"; 253 259 RpLibrary* retlib = NULL; 254 260 PyObject* retVal = NULL; … … 256 262 int status = 0; 257 263 258 static char *kwlist[] = {"path", "as", NULL}; 264 static char *kwlist[] = { 265 (char *)"path", 266 (char *)"as", 267 NULL 268 }; 259 269 260 270 if (self->lib == NULL) { … … 333 343 RpLibraryObject_get(RpLibraryObject *self, PyObject *args, PyObject *keywds) 334 344 { 335 char* path = "";345 char* path = (char *)""; 336 346 337 347 PyObject* decode = NULL; … … 345 355 int status = 0; 346 356 347 static char *kwlist[] = {"path","decode", NULL}; 357 static char *kwlist[] = { 358 (char *)"path", 359 (char *)"decode", 360 NULL 361 }; 348 362 349 363 if (self->lib == NULL) { … … 421 435 RpLibraryObject_parent(RpLibraryObject *self, PyObject *args, PyObject *keywds) 422 436 { 423 char* path = "";424 char* as = "object";437 char* path = (char *)""; 438 char* as = (char *)"object"; 425 439 RpLibrary* retlib = NULL; 426 440 PyObject* retVal = NULL; … … 428 442 int status = 0; 429 443 430 static char *kwlist[] = {"path", "as", NULL}; 444 static char *kwlist[] = { 445 (char *)"path", 446 (char *)"as", 447 NULL 448 }; 431 449 432 450 status = getArgCount(args,keywds,&argc); … … 516 534 RpLibraryObject_put(RpLibraryObject *self, PyObject *args, PyObject *keywds) 517 535 { 518 char *path = "";536 char *path = (char *)""; 519 537 520 538 PyObject *value = NULL; … … 528 546 int appendInt = 0; 529 547 530 char *type = "string";548 char *type = (char *)"string"; 531 549 532 550 PyObject* compress = NULL; … … 536 554 int status = 0; 537 555 538 static char *kwlist[] = {"path","value","id","append", 539 "type","compress", NULL}; 556 static char *kwlist[] = { 557 (char *)"path", 558 (char *)"value", 559 (char *)"id", 560 (char *)"append", 561 (char *)"type", 562 (char *)"compress", 563 NULL 564 }; 540 565 541 566 if (self->lib == NULL) { … … 679 704 int status = 0; 680 705 681 static char *kwlist[] = {"status", NULL}; 706 static char *kwlist[] = { 707 (char *)"status", 708 NULL 709 }; 682 710 683 711 if (self->lib == NULL) { … … 1023 1051 /* Add some symbolic constants to the module */ 1024 1052 if (ErrorObject == NULL) { 1025 ErrorObject = PyErr_NewException( "RpLibrary.error", NULL, NULL);1053 ErrorObject = PyErr_NewException((char *)"RpLibrary.error", NULL, NULL); 1026 1054 if (ErrorObject == NULL) 1027 1055 return; -
trunk/lang/python/Rappture/PyRpUnits.cc
r673 r1326 422 422 PyObject* tmpPyStr = NULL; 423 423 424 static char *kwlist[] = {"fromVal", "to", "units", NULL}; 424 static char *kwlist[] = { 425 (char *)"fromVal", 426 (char *)"to", 427 (char *)"units", 428 NULL 429 }; 425 430 426 431 if (PyTuple_Size(args) > 0) { -
trunk/lang/python/Rappture/PyRpUtils.cc
r673 r1326 1 1 2 /* 2 3 * Rappture Utils Python Interface … … 28 29 int result = -1; 29 30 30 static char *kwlist[] = {"percent", "message", NULL}; 31 31 static char *kwlist[] = { 32 (char *)"percent", 33 (char *)"message", 34 NULL 35 }; 32 36 if (PyTuple_Size(args) != 2) { 33 37 PyErr_SetString(PyExc_TypeError,"progress() takes exactly 2 arguments"); … … 76 80 77 81 if (ErrorObject == NULL) { 78 ErrorObject = PyErr_NewException("Rappture.Utils.error", NULL, NULL); 82 ErrorObject = PyErr_NewException((char *)"Rappture.Utils.error", 83 NULL, NULL); 79 84 if (ErrorObject == NULL) 80 85 return; -
trunk/lang/tcl/src/RpDaemon.c
r1018 r1326 67 67 { 68 68 pid_t pid; 69 int result; 69 70 70 if ( (pid=fork()) < 0) { 71 pid = fork(); 72 if (pid < 0) { 71 73 Tcl_AppendResult(interp, "can't fork daemon", (char*)NULL); 72 74 if (errno == EAGAIN) { … … 85 87 /* child continues... */ 86 88 setsid(); /* become session leader */ 87 chdir("/"); /* root never goes away, so sit here */88 89 result = chdir("/"); /* root never goes away, so sit here */ 90 assert(result == 0); 89 91 /* close at least this much, so pipes in exec'ing process get closed */ 90 92 Tcl_UnregisterChannel(interp, Tcl_GetStdChannel(TCL_STDIN)); -
trunk/lang/tcl/src/RpEncodeTclInterface.cc
r1264 r1326 237 237 } 238 238 else { 239 result = Tcl_GetObjResult(interp); 240 Tcl_AppendStringsToObj( result, err.remark().c_str(), 241 "\n", err.context().c_str(), NULL ); 239 Tcl_AppendResult(interp, err.remark(), "\n", err.context(), NULL); 242 240 } 243 241 return TCL_OK; … … 367 365 } 368 366 else { 369 result = Tcl_GetObjResult(interp); 370 Tcl_AppendStringsToObj( result, err.remark().c_str(), 371 "\n", err.context().c_str(), NULL ); 367 Tcl_AppendResult(interp, err.remark(), "\n", err.context(), NULL); 372 368 } 373 369 return TCL_OK; -
trunk/lang/tcl/src/RpUnitsTclInterface.cc
r1018 r1326 207 207 // check the inValue to see if it has units 208 208 // or if we should use those provided in -context option 209 strtod(inValue.c_str(),&endptr); 209 210 double value; 211 value = strtod(inValue.c_str(),&endptr); 210 212 if (endptr == inValue.c_str()) { 211 213 // there was no numeric value that could be pulled from inValue
Note: See TracChangeset
for help on using the changeset viewer.