Changeset 1326


Ignore:
Timestamp:
Mar 14, 2009, 4:51:26 PM (15 years ago)
Author:
gah
Message:

Cast away warnings from usage of constant strings

Location:
trunk/lang
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/lang/python/Rappture/PyRpEncode.cc

    r1088 r1326  
     1
    12/*
    23 * Rappture Encode Python Interface
    … …  
    2829    PyObject* rv = NULL;
    2930
    30     static char *kwlist[] = {"data", NULL};
     31    static char *kwlist[] = {
     32        (char *)"data",
     33        NULL
     34    };
    3135
    3236    if (PyTuple_Size(args) != 1) {
    … …  
    6165    Rappture::Outcome err;
    6266    Rappture::Buffer buf;
    63     std::string outStr;
    6467
    65     static char *kwlist[] = {"data", "flags", NULL};
     68    static char *kwlist[] = {
     69        (char *)"data",
     70        (char *)"flags",
     71        NULL
     72    };
    6673
    6774    if (PyTuple_Size(args) != 2) {
    … …  
    7986    err &= Rappture::encoding::encode(buf,flags);
    8087    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();
    8293        PyErr_SetString(PyExc_RuntimeError,outStr.c_str());
    8394        buf.clear();
    … …  
    105116    Rappture::Outcome err;
    106117    Rappture::Buffer buf;
    107     std::string outStr;
    108118
    109     static char *kwlist[] = {"data", "flags", NULL};
     119    static char *kwlist[] = {
     120        (char *)"data",
     121        (char *)"flags",
     122        NULL
     123    };
    110124
    111125    if (PyTuple_Size(args) != 2) {
    … …  
    123137    err &= Rappture::encoding::decode(buf,flags);
    124138    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();
    126144        PyErr_SetString(PyExc_RuntimeError,outStr.c_str());
    127145        return NULL;
    … …  
    163181
    164182    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) {
    167186            return;
     187        }
    168188    }
    169189    Py_INCREF(ErrorObject);

  • trunk/lang/python/Rappture/PyRpLibrary.cc

    r1039 r1326  
     1
    12/*
    23 * ======================================================================
    … …  
    171172RpLibraryObject_copy(RpLibraryObject *self, PyObject *args, PyObject *keywds)
    172173{
    173     char *topath = "";
    174     char *frompath = "";
     174    char *topath = (char *)"";
     175    char *frompath = (char *)"";
    175176    int argc = 0;
    176177    int status = 0;
    177178    PyObject *fromobj = (PyObject *) self;
    178179
    179     static char *kwlist[] = {"topath","frompath","fromobj", NULL};
     180    static char *kwlist[] = {
     181        (char *)"topath",
     182        (char *)"frompath",
     183        (char *)"fromobj",
     184        NULL
     185    };
    180186
    181187    if (self->lib == NULL) {
    … …  
    249255RpLibraryObject_element(RpLibraryObject *self, PyObject *args, PyObject *keywds)
    250256{
    251     char* path = "";
    252     char* as = "object";
     257    char* path = (char *)"";
     258    char* as = (char *)"object";
    253259    RpLibrary* retlib = NULL;
    254260    PyObject* retVal = NULL;
    … …  
    256262    int status = 0;
    257263
    258     static char *kwlist[] = {"path", "as", NULL};
     264    static char *kwlist[] = {
     265        (char *)"path",
     266        (char *)"as",
     267        NULL
     268    };
    259269
    260270    if (self->lib == NULL) {
    … …  
    333343RpLibraryObject_get(RpLibraryObject *self, PyObject *args, PyObject *keywds)
    334344{
    335     char* path = "";
     345    char* path = (char *)"";
    336346
    337347    PyObject* decode = NULL;
    … …  
    345355    int status = 0;
    346356
    347     static char *kwlist[] = {"path","decode", NULL};
     357    static char *kwlist[] = {
     358        (char *)"path",
     359        (char *)"decode",
     360        NULL
     361    };
    348362
    349363    if (self->lib == NULL) {
    … …  
    421435RpLibraryObject_parent(RpLibraryObject *self, PyObject *args, PyObject *keywds)
    422436{
    423     char* path = "";
    424     char* as = "object";
     437    char* path = (char *)"";
     438    char* as = (char *)"object";
    425439    RpLibrary* retlib = NULL;
    426440    PyObject* retVal = NULL;
    … …  
    428442    int status = 0;
    429443
    430     static char *kwlist[] = {"path", "as", NULL};
     444    static char *kwlist[] = {
     445        (char *)"path",
     446        (char *)"as",
     447        NULL
     448    };
    431449
    432450    status = getArgCount(args,keywds,&argc);
    … …  
    516534RpLibraryObject_put(RpLibraryObject *self, PyObject *args, PyObject *keywds)
    517535{
    518     char *path = "";
     536    char *path = (char *)"";
    519537
    520538    PyObject *value = NULL;
    … …  
    528546    int appendInt = 0;
    529547
    530     char *type = "string";
     548    char *type = (char *)"string";
    531549
    532550    PyObject* compress = NULL;
    … …  
    536554    int status = 0;
    537555
    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    };
    540565
    541566    if (self->lib == NULL) {
    … …  
    679704    int status = 0;
    680705
    681     static char *kwlist[] = {"status", NULL};
     706    static char *kwlist[] = {
     707        (char *)"status",
     708        NULL
     709    };
    682710
    683711    if (self->lib == NULL) {
    … …  
    10231051    /* Add some symbolic constants to the module */
    10241052    if (ErrorObject == NULL) {
    1025         ErrorObject = PyErr_NewException("RpLibrary.error", NULL, NULL);
     1053        ErrorObject = PyErr_NewException((char *)"RpLibrary.error", NULL, NULL);
    10261054        if (ErrorObject == NULL)
    10271055            return;

  • trunk/lang/python/Rappture/PyRpUnits.cc

    r673 r1326  
    422422    PyObject* tmpPyStr = NULL;
    423423
    424     static char *kwlist[] = {"fromVal", "to", "units", NULL};
     424    static char *kwlist[] = {
     425        (char *)"fromVal",
     426        (char *)"to",
     427        (char *)"units",
     428        NULL
     429    };
    425430
    426431    if (PyTuple_Size(args) > 0) {

  • trunk/lang/python/Rappture/PyRpUtils.cc

    r673 r1326  
     1
    12/*
    23 * Rappture Utils Python Interface
    … …  
    2829    int result = -1;
    2930
    30     static char *kwlist[] = {"percent", "message", NULL};
    31 
     31    static char *kwlist[] = {
     32        (char *)"percent",
     33        (char *)"message",
     34        NULL
     35    };
    3236    if (PyTuple_Size(args) != 2) {
    3337        PyErr_SetString(PyExc_TypeError,"progress() takes exactly 2 arguments");
    … …  
    7680
    7781    if (ErrorObject == NULL) {
    78         ErrorObject = PyErr_NewException("Rappture.Utils.error", NULL, NULL);
     82        ErrorObject = PyErr_NewException((char *)"Rappture.Utils.error",
     83                NULL, NULL);
    7984        if (ErrorObject == NULL)
    8085            return;

  • trunk/lang/tcl/src/RpDaemon.c

    r1018 r1326  
    6767{
    6868    pid_t pid;
     69    int result;
    6970
    70     if ( (pid=fork()) < 0) {
     71    pid = fork();
     72    if (pid < 0) {
    7173        Tcl_AppendResult(interp, "can't fork daemon", (char*)NULL);
    7274        if (errno == EAGAIN) {
    … …  
    8587    /* child continues... */
    8688    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);
    8991    /* close at least this much, so pipes in exec'ing process get closed */
    9092    Tcl_UnregisterChannel(interp, Tcl_GetStdChannel(TCL_STDIN));

  • trunk/lang/tcl/src/RpEncodeTclInterface.cc

    r1264 r1326  
    237237    }
    238238    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);
    242240    }
    243241    return TCL_OK;
    … …  
    367365    }
    368366    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);
    372368    }
    373369    return TCL_OK;

  • trunk/lang/tcl/src/RpUnitsTclInterface.cc

    r1018 r1326  
    207207    // check the inValue to see if it has units
    208208    // 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);
    210212    if (endptr == inValue.c_str()) {
    211213        // there was no numeric value that could be pulled from inValue
Note: See TracChangeset for help on using the changeset viewer.