Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Convert all Tcl_SetResult calls to Tcl_SetObjResult calls. Convert Tcl_GetStringFromObj to Tcl_GetString when possible. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
4c01ee19d4dd413193367ae99f07f40c |
User & Date: | jan.nijtmans 2013-01-28 11:24:03 |
Context
2013-01-31
| ||
11:21 | Bug [3602534]: Test for XScreensaver last. check-in: e5a82192 user: stwo tags: trunk | |
2013-01-28
| ||
11:33 | merge trunk check-in: 1257e708 user: jan.nijtmans tags: novem-support | |
11:24 | Convert all Tcl_SetResult calls to Tcl_SetObjResult calls. Convert Tcl_GetStringFromObj to Tcl_GetString when possible. check-in: 4c01ee19 user: jan.nijtmans tags: trunk | |
2013-01-26
| ||
00:24 | Use some more (void *)'s in FreeProc's, a step in the direction getting Tk to work with "novem" check-in: 9279332c user: jan.nijtmans tags: trunk | |
Changes
Changes to generic/tkConfig.c.
︙ | ︙ | |||
1343 1344 1345 1346 1347 1348 1349 | optionPtr = optionPtr->extra.synonymPtr; } if (objc < 2) { if (interp != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "value for \"%s\" missing", | | | 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 | optionPtr = optionPtr->extra.synonymPtr; } if (objc < 2) { if (interp != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "value for \"%s\" missing", Tcl_GetString(*objv))); Tcl_SetErrorCode(interp, "TK", "VALUE_MISSING", NULL); goto error; } } if ((savePtr != NULL) && (lastSavePtr->numItems >= TK_NUM_SAVED_OPTIONS)) { /* |
︙ | ︙ | |||
1368 1369 1370 1371 1372 1373 1374 | lastSavePtr = newSavePtr; } if (DoObjConfig(interp, recordPtr, optionPtr, objv[1], tkwin, (savePtr != NULL) ? &lastSavePtr->items[lastSavePtr->numItems] : NULL) != TCL_OK) { Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf( "\n (processing \"%.40s\" option)", | | | 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 | lastSavePtr = newSavePtr; } if (DoObjConfig(interp, recordPtr, optionPtr, objv[1], tkwin, (savePtr != NULL) ? &lastSavePtr->items[lastSavePtr->numItems] : NULL) != TCL_OK) { Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf( "\n (processing \"%.40s\" option)", Tcl_GetString(*objv))); goto error; } if (savePtr != NULL) { lastSavePtr->numItems++; } mask |= optionPtr->specPtr->typeMask; } |
︙ | ︙ |
Changes to generic/tkObj.c.
︙ | ︙ | |||
443 444 445 446 447 448 449 | { const Tcl_ObjType *typePtr; const char *string; char *rest; double d; int i, units; | | | 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 | { const Tcl_ObjType *typePtr; const char *string; char *rest; double d; int i, units; string = Tcl_GetString(objPtr); d = strtod(string, &rest); if (rest == string) { goto error; } while ((*rest != '\0') && isspace(UCHAR(*rest))) { rest++; |
︙ | ︙ | |||
715 716 717 718 719 720 721 | /* * In the case of ints, we need to ensure that a valid string exists * in order for int-but-not-string objects to be converted back to * ints again from mm obj types. */ | | | | 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 | /* * In the case of ints, we need to ensure that a valid string exists * in order for int-but-not-string objects to be converted back to * ints again from mm obj types. */ (void) Tcl_GetString(objPtr); } else { /* * It wasn't a known int or double, so parse it. */ string = Tcl_GetString(objPtr); d = strtod(string, &rest); if (rest == string) { /* * Must copy string before resetting the result in case a caller * is trying to convert the interpreter's result to mms. */ |
︙ | ︙ | |||
830 831 832 833 834 835 836 | || winPtr->mainPtr != mainPtr || winPtr->epoch != mainPtr->deletionEpoch) { /* * Cache is invalid. */ winPtr->tkwin = Tk_NameToWindow(interp, | | | 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 | || winPtr->mainPtr != mainPtr || winPtr->epoch != mainPtr->deletionEpoch) { /* * Cache is invalid. */ winPtr->tkwin = Tk_NameToWindow(interp, Tcl_GetString(objPtr), tkwin); if (winPtr->tkwin == NULL) { /* ASSERT: Tk_NameToWindow has left error message in interp */ return TCL_ERROR; } winPtr->mainPtr = mainPtr; winPtr->epoch = mainPtr ? mainPtr->deletionEpoch : 0; |
︙ | ︙ | |||
876 877 878 879 880 881 882 | const Tcl_ObjType *typePtr; WindowRep *winPtr; /* * Free the old internalRep before setting the new one. */ | | | 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 | const Tcl_ObjType *typePtr; WindowRep *winPtr; /* * Free the old internalRep before setting the new one. */ Tcl_GetString(objPtr); typePtr = objPtr->typePtr; if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) { typePtr->freeIntRepProc(objPtr); } winPtr = ckalloc(sizeof(WindowRep)); winPtr->tkwin = NULL; |
︙ | ︙ |
Changes to generic/tkOldConfig.c.
︙ | ︙ | |||
118 119 120 121 122 123 124 | * match entries in the specs. */ for ( ; argc > 0; argc -= 2, argv += 2) { const char *arg; if (flags & TK_CONFIG_OBJS) { | | | 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 | * match entries in the specs. */ for ( ; argc > 0; argc -= 2, argv += 2) { const char *arg; if (flags & TK_CONFIG_OBJS) { arg = Tcl_GetString((Tcl_Obj *) *argv); } else { arg = *argv; } specPtr = FindConfigSpec(interp, staticSpecs, arg, needFlags, hateFlags); if (specPtr == NULL) { return TCL_ERROR; } |
︙ | ︙ |
Changes to generic/tkPanedWindow.c.
︙ | ︙ | |||
380 381 382 383 384 385 386 | if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "pathName ?-option value ...?"); return TCL_ERROR; } tkwin = Tk_CreateWindowFromPath(interp, Tk_MainWindow(interp), | | | 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 | if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "pathName ?-option value ...?"); return TCL_ERROR; } tkwin = Tk_CreateWindowFromPath(interp, Tk_MainWindow(interp), Tcl_GetString(objv[1]), NULL); if (tkwin == NULL) { return TCL_ERROR; } pwOpts = (OptionTables *) Tcl_GetAssocData(interp, "PanedWindowOptionTables", NULL); if (pwOpts == NULL) { |
︙ | ︙ |
Changes to generic/tkTest.c.
︙ | ︙ | |||
1730 1731 1732 1733 1734 1735 1736 | Tcl_AppendResult(interp, "bad option \"", argv[1], "\": must be window", NULL); return TCL_ERROR; } return TCL_OK; #else | | < | 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 | Tcl_AppendResult(interp, "bad option \"", argv[1], "\": must be window", NULL); return TCL_ERROR; } return TCL_OK; #else Tcl_AppendResult(interp, "testmenubar is supported only under Unix", NULL); return TCL_ERROR; #endif } #endif /* *---------------------------------------------------------------------- |
︙ | ︙ | |||
1864 1865 1866 1867 1868 1869 1870 | if ((result == Success) && (actualType != None)) { if ((actualFormat == 8) && (actualType == XA_STRING)) { for (p = property; ((unsigned long)(p-property)) < length; p++) { if (*p == 0) { *p = '\n'; } } | | | 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 | if ((result == Success) && (actualType != None)) { if ((actualFormat == 8) && (actualType == XA_STRING)) { for (p = property; ((unsigned long)(p-property)) < length; p++) { if (*p == 0) { *p = '\n'; } } Tcl_SetObjResult(interp, Tcl_NewStringObj((/*!unsigned*/char*)property, -1)); } else { for (p = property; length > 0; length--) { if (actualFormat == 32) { value = *((long *) p); p += sizeof(long); } else if (actualFormat == 16) { value = 0xffff & (*((short *) p)); |
︙ | ︙ | |||
1935 1936 1937 1938 1939 1940 1941 | } wrapperPtr = TkpGetWrapperWindow(winPtr); if (wrapperPtr != NULL) { char buf[TCL_INTEGER_SPACE]; TkpPrintWindowId(buf, Tk_WindowId(wrapperPtr)); | | | 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 | } wrapperPtr = TkpGetWrapperWindow(winPtr); if (wrapperPtr != NULL) { char buf[TCL_INTEGER_SPACE]; TkpPrintWindowId(buf, Tk_WindowId(wrapperPtr)); Tcl_SetObjResult(interp, Tcl_NewStringObj(buf, -1)); } return TCL_OK; } #endif /* *---------------------------------------------------------------------- |
︙ | ︙ | |||
2009 2010 2011 2012 2013 2014 2015 | if ((flags & TK_OPTION_NULL_OK) && objEmpty) { *value = NULL; } else { string = Tcl_GetStringFromObj((*value), &length); Tcl_UtfToUpper(string); if (strcmp(string, "BAD") == 0) { | | < | 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 | if ((flags & TK_OPTION_NULL_OK) && objEmpty) { *value = NULL; } else { string = Tcl_GetStringFromObj((*value), &length); Tcl_UtfToUpper(string); if (strcmp(string, "BAD") == 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj("expected good value, got \"BAD\"", -1)); return TCL_ERROR; } } if (internalPtr != NULL) { if ((*value) != NULL) { string = Tcl_GetStringFromObj((*value), &length); newStr = ckalloc(length + 1); |
︙ | ︙ |
Changes to generic/tkUtil.c.
︙ | ︙ | |||
966 967 968 969 970 971 972 | return PTR2INT(keyPtr->internalRep.twoPtrValue.ptr2); } /* * Not there. Look in the state map. */ | | | 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 | return PTR2INT(keyPtr->internalRep.twoPtrValue.ptr2); } /* * Not there. Look in the state map. */ key = Tcl_GetString(keyPtr); for (mPtr = mapPtr; mPtr->strKey != NULL; mPtr++) { if (strcmp(key, mPtr->strKey) == 0) { typePtr = keyPtr->typePtr; if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) { typePtr->freeIntRepProc(keyPtr); } keyPtr->internalRep.twoPtrValue.ptr1 = (void *) mapPtr; |
︙ | ︙ |
Changes to win/tkWinDialog.c.
︙ | ︙ | |||
1130 1131 1132 1133 1134 1135 1136 | const char *initial = NULL; int pass; int ix = 0; /* index counter */ FileFilterList flist; FileFilter *filterPtr; if (initialPtr) { | | | 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 | const char *initial = NULL; int pass; int ix = 0; /* index counter */ FileFilterList flist; FileFilter *filterPtr; if (initialPtr) { initial = Tcl_GetString(initialPtr); } TkInitFileFilters(&flist); if (TkGetFileFilters(interp, &flist, valuePtr, 1) != TCL_OK) { return TCL_ERROR; } if (flist.filters == NULL) { |
︙ | ︙ |
Changes to win/tkWinMenu.c.
︙ | ︙ | |||
1944 1945 1946 1947 1948 1949 1950 | int len; /* do the unicode call just to prevent overruns */ Tcl_GetUnicodeFromObj(mePtr->labelPtr, &len); if (mePtr->underline < len) { const char *label, *start, *end; | | | 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 | int len; /* do the unicode call just to prevent overruns */ Tcl_GetUnicodeFromObj(mePtr->labelPtr, &len); if (mePtr->underline < len) { const char *label, *start, *end; label = Tcl_GetString(mePtr->labelPtr); start = Tcl_UtfAtIndex(label, mePtr->underline); end = Tcl_UtfNext(start); Tk_UnderlineChars(menuPtr->display, d, gc, tkfont, label, x + mePtr->indicatorSpace, y + (height + fmPtr->ascent - fmPtr->descent) / 2, (int) (start - label), (int) (end - label)); } |
︙ | ︙ |
Changes to win/tkWinTest.c.
︙ | ︙ | |||
282 283 284 285 286 287 288 | return TCL_ERROR; } #endif hwnd = INT2PTR(strtol(argv[1], &rest, 0)); if (rest == argv[1]) { hwnd = FindWindowA(NULL, argv[1]); if (hwnd == NULL) { | | | 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 | return TCL_ERROR; } #endif hwnd = INT2PTR(strtol(argv[1], &rest, 0)); if (rest == argv[1]) { hwnd = FindWindowA(NULL, argv[1]); if (hwnd == NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj("no such window", -1)); return TCL_ERROR; } } UpdateWindow(hwnd); id = strtol(argv[2], &rest, 0); if (rest == argv[2]) { |
︙ | ︙ | |||
337 338 339 340 341 342 343 | Tcl_DString ds; BOOL result; Tcl_UtfToExternalDString(NULL, argv[4], -1, &ds); result = SetDlgItemTextA(hwnd, id, Tcl_DStringValue(&ds)); Tcl_DStringFree(&ds); if (result == 0) { | | | | | 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 | Tcl_DString ds; BOOL result; Tcl_UtfToExternalDString(NULL, argv[4], -1, &ds); result = SetDlgItemTextA(hwnd, id, Tcl_DStringValue(&ds)); Tcl_DStringFree(&ds); if (result == 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj("failed to send text to dialog: ", -1)); AppendSystemError(interp, GetLastError()); return TCL_ERROR; } break; } case WM_COMMAND: { char buf[TCL_INTEGER_SPACE]; if (argc < 5) { wParam = MAKEWPARAM(id, 0); lParam = (LPARAM)child; } sprintf(buf, "%d", (int) SendMessageA(hwnd, message, wParam, lParam)); Tcl_SetObjResult(interp, Tcl_NewStringObj(buf, -1)); break; } default: { char buf[TCL_INTEGER_SPACE]; sprintf(buf, "%d", (int) SendDlgItemMessageA(hwnd, id, message, wParam, lParam)); Tcl_SetObjResult(interp, Tcl_NewStringObj(buf, -1)); break; } } return TCL_OK; } /* |
︙ | ︙ | |||
451 452 453 454 455 456 457 | } if (Tcl_GetLongFromObj(interp, objv[1], &hwnd) != TCL_OK) return TCL_ERROR; cch = GetClassName(INT2PTR(hwnd), buf, cchBuf); if (cch == 0) { | | | 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 | } if (Tcl_GetLongFromObj(interp, objv[1], &hwnd) != TCL_OK) return TCL_ERROR; cch = GetClassName(INT2PTR(hwnd), buf, cchBuf); if (cch == 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj("failed to get class name: ", -1)); AppendSystemError(interp, GetLastError()); return TCL_ERROR; } else { Tcl_DString ds; Tcl_WinTCharToUtf(buf, -1, &ds); classObj = Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds)); Tcl_DStringFree(&ds); |
︙ | ︙ |