Index: generic/aolstub.c =================================================================== diff -u -ra963e8896fd07c345ccfa034cbd043344edbf083 -r62dc29237e6a643169841f002784c7dc0b29f201 --- generic/aolstub.c (.../aolstub.c) (revision a963e8896fd07c345ccfa034cbd043344edbf083) +++ generic/aolstub.c (.../aolstub.c) (revision 62dc29237e6a643169841f002784c7dc0b29f201) @@ -183,7 +183,7 @@ assert(hServer != NULL); assert(hModule != NULL); - /*Ns_Log(Notice, "+++ ModuleInit","INIT");*/ + /*Ns_Log(Notice, "+++ ModuleInit", "INIT");*/ ret = Ns_TclInitInterps(hServer, NsNsf_Init, (void*)hModule); if (ret == TCL_OK) { Index: generic/nsf.c =================================================================== diff -u -rb6e483e0205aa1f1d618d5d536b6f7b8ed75272d -r62dc29237e6a643169841f002784c7dc0b29f201 --- generic/nsf.c (.../nsf.c) (revision b6e483e0205aa1f1d618d5d536b6f7b8ed75272d) +++ generic/nsf.c (.../nsf.c) (revision 62dc29237e6a643169841f002784c7dc0b29f201) @@ -14472,7 +14472,7 @@ if (RUNTIME_STATE(interp)->unknown) { Tcl_Obj *callInfoObj = Tcl_NewListObj(1, &callerSelf->cmdName); - Tcl_CallFrame *varFramePtr, *tclFramePtr = CallStackGetTclFrame(interp,(Tcl_CallFrame *)framePtr, 1); + Tcl_CallFrame *varFramePtr, *tclFramePtr = CallStackGetTclFrame(interp, (Tcl_CallFrame *)framePtr, 1); int pathLength, pathLength0 = 0, unknownIndex; Tcl_Obj *pathObj = NsfMethodNamePath(interp, tclFramePtr, MethodName(objv[0])); bool getPath = NSF_TRUE; @@ -15287,7 +15287,7 @@ * Save the NsfColonCmdContext in the proc context for memory management * and as well for reuse in twoPtrValue.ptr2. */ - /* rst->freeListPtr = NsfListCons(ccCtxPtr,rst->freeListPtr); */ + /* rst->freeListPtr = NsfListCons(ccCtxPtr, rst->freeListPtr); */ NsfDListAppend(&rst->freeDList, ccCtxPtr); methodObj->internalRep.twoPtrValue.ptr2 = ccCtxPtr; @@ -18268,7 +18268,9 @@ {int i; fprintf(stderr, "ParameterMethodDispatch %s flags %06x nrRemainingArgs %d ", paramPtr->name, paramPtr->flags, nrRemainingArgs); - for(i = 0; i < nrRemainingArgs; i++) {fprintf(stderr, " [%d]=%p %s,", i, &nextObjPtr[i], ObjStr(nextObjPtr[i]));} + for(i = 0; i < nrRemainingArgs; i++) { + fprintf(stderr, " [%d]=%p %s,", i, &nextObjPtr[i], ObjStr(nextObjPtr[i])); + } fprintf(stderr, "\n"); } #endif @@ -19606,7 +19608,7 @@ Tcl_DStringAppend(dsPtr, "%1 {", 4); Tcl_DStringAppend(dsPtr, ObjStr(withDefault), -1); Tcl_DStringAppend(dsPtr, "}", 1); - NsfDeprecatedCmd(interp, "forward option","-default ...", Tcl_DStringValue(dsPtr)); + NsfDeprecatedCmd(interp, "forward option", "-default ...", Tcl_DStringValue(dsPtr)); DSTRING_FREE(dsPtr); tcd->subcommands = withDefault; @@ -25031,7 +25033,7 @@ Tcl_GetCommandName(NULL, cmd), Tcl_GetCommandName(NULL, tcd->aliasedCmd), (void*)cmd, (void*)tcd->aliasedCmd ); char *name =Tcl_GetCommandName(NULL, cmd); - if (!strcmp("incr",name)) {char *p = NULL; *p=1;} + if (!strcmp("incr", name)) {char *p = NULL; *p=1;} */ cmd = tcd->aliasedCmd; @@ -25888,7 +25890,7 @@ Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj("-debug", 6)); } if (((unsigned int)Tcl_Command_flags(tcd->wrapperCmd) & NSF_CMD_DEPRECATED_METHOD) != 0) { - Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj("-deprecated",11)); + Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj("-deprecated", 11)); } Tcl_ListObjAppendElement(interp, resultObj, @@ -26863,9 +26865,9 @@ Tcl_DStringAppend(dsPtr, ",", 1); Tcl_DStringAppend(dsPtr, methodName, -11); if (withPer_object) { - Tcl_DStringAppend(dsPtr, ",1", 2); + Tcl_DStringAppend(dsPtr, ",1", 2); } else { - Tcl_DStringAppend(dsPtr, ",0", 2); + Tcl_DStringAppend(dsPtr, ",0", 2); } /*fprintf(stderr, "AI %s\n", Tcl_DStringValue(dsPtr));*/ resultObj = Tcl_NewStringObj(dsPtr->string, dsPtr->length); @@ -27157,7 +27159,7 @@ AliasCmdClientData *tcd = (AliasCmdClientData *)Tcl_Command_objClientData(cmd); assert(tcd != NULL); - /*fprintf(stderr, "AliasDereference %s epoch %d\n",methodName, Tcl_Command_cmdEpoch(tcd->aliasedCmd));*/ + /*fprintf(stderr, "AliasDereference %s epoch %d\n", methodName, Tcl_Command_cmdEpoch(tcd->aliasedCmd));*/ if (unlikely(Tcl_Command_cmdEpoch(tcd->aliasedCmd) != 0)) { /*fprintf(stderr, "NsfProcAliasMethod aliasedCmd %p epoch %p\n", @@ -28171,7 +28173,7 @@ int result; /* fprintf(stderr, "#### (%lx) NsfFinalizeCmd exitHandlerRound %d\n", - (long)(void*)pthread_self(),RUNTIME_STATE(interp)->exitHandlerDestroyRound );*/ + (long)(void*)pthread_self(), RUNTIME_STATE(interp)->exitHandlerDestroyRound );*/ nonnull_assert(interp != NULL); @@ -28220,11 +28222,11 @@ /*fprintf(stderr, "CLEANUP TOP NS\n");*/ Tcl_Export(interp, rst->NsfNS, "", 1); if (rst->NsfClassesNS != NULL) { - MEM_COUNT_FREE("TclNamespace",rst->NsfClassesNS); + MEM_COUNT_FREE("TclNamespace", rst->NsfClassesNS); Tcl_DeleteNamespace(rst->NsfClassesNS); } if (rst->NsfNS != NULL) { - MEM_COUNT_FREE("TclNamespace",rst->NsfNS); + MEM_COUNT_FREE("TclNamespace", rst->NsfNS); Tcl_DeleteNamespace(rst->NsfNS); } @@ -35250,7 +35252,7 @@ /* * Free runtime state. */ - /*fprintf(stderr, "+++ ExiHandler frees runtime state of interp %p\n",interp);*/ + /*fprintf(stderr, "+++ ExiHandler frees runtime state of interp %p\n", interp);*/ ckfree((char *) rst); #if defined(USE_ASSOC_DATA) Tcl_DeleteAssocData(interp, "NsfRuntimeState"); Index: generic/nsfCmdPtr.c =================================================================== diff -u -ra963e8896fd07c345ccfa034cbd043344edbf083 -r62dc29237e6a643169841f002784c7dc0b29f201 --- generic/nsfCmdPtr.c (.../nsfCmdPtr.c) (revision a963e8896fd07c345ccfa034cbd043344edbf083) +++ generic/nsfCmdPtr.c (.../nsfCmdPtr.c) (revision 62dc29237e6a643169841f002784c7dc0b29f201) @@ -50,7 +50,7 @@ nonnull_assert(cmd != NULL); - /*fprintf(stderr, "objProc=%p %p\n", Tcl_Command_objProc(cmd),NsfObjDispatch);*/ + /*fprintf(stderr, "objProc=%p %p\n", Tcl_Command_objProc(cmd), NsfObjDispatch);*/ if (likely(Tcl_Command_objProc(cmd) == NsfObjDispatch)) { result = Tcl_Command_objClientData(cmd); @@ -75,7 +75,7 @@ nonnull_assert(cmd != NULL); cd = NsfGetClientDataFromCmdPtr(cmd); - /*fprintf(stderr, "cd=%p\n",cd);*/ + /*fprintf(stderr, "cd=%p\n", cd);*/ if (likely(cd != NULL)) { result = NsfObjectToClass(cd); } else { Index: generic/nsfCompile.c =================================================================== diff -u -ra963e8896fd07c345ccfa034cbd043344edbf083 -r62dc29237e6a643169841f002784c7dc0b29f201 --- generic/nsfCompile.c (.../nsfCompile.c) (revision a963e8896fd07c345ccfa034cbd043344edbf083) +++ generic/nsfCompile.c (.../nsfCompile.c) (revision 62dc29237e6a643169841f002784c7dc0b29f201) @@ -161,20 +161,20 @@ wordIdx++, tokenPtr += (tokenPtr->numComponents + 1)) { /* - fprintf(stderr," %d: %p token type=%d size=%d\n", + fprintf(stderr, " %d: %p token type=%d size=%d\n", wordIdx, tokenPtr, tokenPtr->type, tokenPtr->size ); */ if (tokenPtr->type == TCL_TOKEN_SIMPLE_WORD) { TclEmitPush(TclRegisterLiteral(envPtr, tokenPtr->start, tokenPtr->size, 0), envPtr); envPtr->maxStackDepth = 1; /* - fprintf(stderr," %d: simple '%s' components=%d\n", + fprintf(stderr, " %d: simple '%s' components=%d\n", wordIdx, tokenPtr->start, tokenPtr->numComponents); */ } else { /* - fprintf(stderr," %d NOT simple '%s' components=%d\n", + fprintf(stderr, " %d NOT simple '%s' components=%d\n", wordIdx, tokenPtr->start, tokenPtr->numComponents); */ code = TclCompileTokens(interp, tokenPtr+1, Index: generic/nsfDebug.c =================================================================== diff -u -ra963e8896fd07c345ccfa034cbd043344edbf083 -r62dc29237e6a643169841f002784c7dc0b29f201 --- generic/nsfDebug.c (.../nsfDebug.c) (revision a963e8896fd07c345ccfa034cbd043344edbf083) +++ generic/nsfDebug.c (.../nsfDebug.c) (revision 62dc29237e6a643169841f002784c7dc0b29f201) @@ -130,8 +130,8 @@ && (f->procPtr != NULL) && (f->procPtr->cmdPtr != NULL) ) { - fprintf(stderr,"caller %p ", (void *)Tcl_CallFrame_callerPtr(f)); - fprintf(stderr,"callerV %p ", (void *)Tcl_CallFrame_callerVarPtr(f)); + fprintf(stderr, "caller %p ", (void *)Tcl_CallFrame_callerPtr(f)); + fprintf(stderr, "callerV %p ", (void *)Tcl_CallFrame_callerVarPtr(f)); Tcl_GetCommandFullName(interp, (Tcl_Command)f->procPtr->cmdPtr, cmdObj); fprintf(stderr, "%s (%p) lvl=%d\n", ObjStr(cmdObj), (void *)f->procPtr->cmdPtr, f->level); } else { Index: generic/nsfProfile.c =================================================================== diff -u -r1f532a9dd165fbbf7f3a3f470f7661acf4c35fad -r62dc29237e6a643169841f002784c7dc0b29f201 --- generic/nsfProfile.c (.../nsfProfile.c) (revision 1f532a9dd165fbbf7f3a3f470f7661acf4c35fad) +++ generic/nsfProfile.c (.../nsfProfile.c) (revision 62dc29237e6a643169841f002784c7dc0b29f201) @@ -122,7 +122,7 @@ NsfProfileMethodLabel(&ds, class, methodName); Tcl_DStringAppend(&ds, "}", 1); - NsfDeprecatedCmd(interp,"method", ds.string, altMethod); + NsfDeprecatedCmd(interp, "method", ds.string, altMethod); Tcl_DStringFree(&ds); } Index: generic/nsfShadow.c =================================================================== diff -u -ref01bf0b1fa63c266b7276dae6c1f376587221fa -r62dc29237e6a643169841f002784c7dc0b29f201 --- generic/nsfShadow.c (.../nsfShadow.c) (revision ef01bf0b1fa63c266b7276dae6c1f376587221fa) +++ generic/nsfShadow.c (.../nsfShadow.c) (revision 62dc29237e6a643169841f002784c7dc0b29f201) @@ -69,7 +69,7 @@ nonnull_assert(nameObj != NULL); nonnull_assert(ti != NULL); - /*fprintf(stderr," cleanup for %s ti=%p in %p\n", NsfGlobalStrings[name], ti, interp);*/ + /*fprintf(stderr, " cleanup for %s ti=%p in %p\n", NsfGlobalStrings[name], ti, interp);*/ cmd = Tcl_GetCommandFromObj(interp, nameObj); if (cmd != NULL) { Tcl_Command_objProc(cmd) = ti->proc; @@ -155,7 +155,7 @@ nonnull_assert(nameObj != NULL); nonnull_assert(ti != NULL); - /* fprintf(stderr,"NsfReplaceCommand %s\n", ObjStr(nameObj)); */ + /* fprintf(stderr, "NsfReplaceCommand %s\n", ObjStr(nameObj)); */ cmd = Tcl_GetCommandFromObj(interp, nameObj); if (cmd == NULL) { @@ -387,15 +387,17 @@ Tcl_ListObjAppendElement(interp, listObj, ov[i+1]); } - Tcl_ListObjAppendElement(interp, listObj, Tcl_NewStringObj("object",6)); + Tcl_ListObjAppendElement(interp, listObj, Tcl_NewStringObj("object", 6)); Tcl_ListObjAppendElement(interp, listObj, cscPtr->self->cmdName); - Tcl_ListObjAppendElement(interp, listObj, Tcl_NewStringObj("class",5)); + Tcl_ListObjAppendElement(interp, listObj, Tcl_NewStringObj("class", 5)); Tcl_ListObjAppendElement(interp, listObj, (cscPtr->cl != NULL) ? cscPtr->cl->object.cmdName : NsfGlobalObjs[NSF_EMPTY]); - Tcl_ListObjAppendElement(interp, listObj, Tcl_NewStringObj("method",6)); - Tcl_ListObjAppendElement(interp, listObj, (cscPtr->cmdPtr != NULL) ? Tcl_NewStringObj(Tcl_GetCommandName(interp, cscPtr->cmdPtr), -1) + Tcl_ListObjAppendElement(interp, listObj, Tcl_NewStringObj("method", 6)); + Tcl_ListObjAppendElement(interp, listObj, + (cscPtr->cmdPtr != NULL) + ? Tcl_NewStringObj(Tcl_GetCommandName(interp, cscPtr->cmdPtr), -1) : NsfGlobalObjs[NSF_EMPTY]); - Tcl_ListObjAppendElement(interp, listObj, Tcl_NewStringObj("frametype",9)); + Tcl_ListObjAppendElement(interp, listObj, Tcl_NewStringObj("frametype", 9)); if (cscPtr->frameType == NSF_CSC_TYPE_PLAIN) { frameType = "intrinsic"; } else if (cscPtr->frameType & NSF_CSC_TYPE_ACTIVE_MIXIN) { @@ -407,16 +409,16 @@ } else { frameType = "unknown"; } - Tcl_ListObjAppendElement(interp, listObj, Tcl_NewStringObj(frameType,-1)); + Tcl_ListObjAppendElement(interp, listObj, Tcl_NewStringObj(frameType, -1)); Tcl_SetObjResult(interp, listObj); } else if (frameFlags & (FRAME_IS_NSF_OBJECT)) { NsfObject *object = (NsfObject *)Tcl_CallFrame_clientData(varFramePtr); /* Tcl_Obj *listObj = Tcl_NewListObj(0, NULL); */ - Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj("object",6)); + Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj("object", 6)); Tcl_ListObjAppendElement(interp, resultObj, object->cmdName); - Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj("frameType",9)); - Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj("object",6)); + Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj("frameType", 9)); + Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj("object", 6)); Tcl_SetObjResult(interp, resultObj); } } @@ -484,9 +486,9 @@ NsfReplaceCommandCheck(interp, NsfGlobalObjs[NSF_INFO_FRAME], Nsf_InfoFrameObjCmd, CMD_INFO(rst, NSF_INFO_FRAME)); NsfReplaceCommandCheck(interp, NsfGlobalObjs[NSF_RENAME], Nsf_RenameObjCmd, CMD_INFO(rst, NSF_RENAME)); } else { - NsfReplaceCommandCleanup(interp, NsfGlobalObjs[NSF_INFO_BODY], CMD_INFO(rst, NSF_INFO_BODY)); - NsfReplaceCommandCleanup(interp, NsfGlobalObjs[NSF_INFO_FRAME],CMD_INFO(rst, NSF_INFO_FRAME)); - NsfReplaceCommandCleanup(interp, NsfGlobalObjs[NSF_RENAME], CMD_INFO(rst, NSF_RENAME)); + NsfReplaceCommandCleanup(interp, NsfGlobalObjs[NSF_INFO_BODY], CMD_INFO(rst, NSF_INFO_BODY)); + NsfReplaceCommandCleanup(interp, NsfGlobalObjs[NSF_INFO_FRAME], CMD_INFO(rst, NSF_INFO_FRAME)); + NsfReplaceCommandCleanup(interp, NsfGlobalObjs[NSF_RENAME], CMD_INFO(rst, NSF_RENAME)); FREE(NsfShadowTclCommandInfo*, rst->tclCommands); rst->tclCommands = NULL; @@ -518,7 +520,7 @@ ALLOC_ON_STACK(Tcl_Obj*, objc, ov); /* {int i; - fprintf(stderr,"calling %s (%p %p) in %p, objc=%d ", + fprintf(stderr, "calling %s (%p %p) in %p, objc=%d ", NsfGlobalStrings[name], ti, ti->proc, interp, objc); for(i=0;insPtr != NULL) { Tcl_PushCallFrame(interp, (Tcl_CallFrame *)framePtr, object->nsPtr, 0|FRAME_IS_NSF_OBJECT); @@ -345,7 +345,7 @@ nonnull_assert(interp != NULL); nonnull_assert(framePtr != NULL); - /*fprintf(stderr,"POP OBJECT_FRAME (Nsf_PopFrameObj) frame %p, varTable %p set to NULL, already %d\n", + /*fprintf(stderr, "POP OBJECT_FRAME (Nsf_PopFrameObj) frame %p, varTable %p set to NULL, already %d\n", framePtr, Tcl_CallFrame_varTablePtr(framePtr), Tcl_CallFrame_varTablePtr(framePtr) == NULL);*/ Tcl_CallFrame_varTablePtr(framePtr) = NULL; @@ -377,7 +377,7 @@ nonnull_assert(framePtr != NULL); varFramePtr = Tcl_Interp_varFramePtr(interp); - /*fprintf(stderr,"PUSH CMETHOD_FRAME (Nsf_PushFrameCsc) frame %p cscPtr %p methodName %s\n", + /*fprintf(stderr, "PUSH CMETHOD_FRAME (Nsf_PushFrameCsc) frame %p cscPtr %p methodName %s\n", framePtr, cscPtr, Tcl_GetCommandName(interp, cscPtr->cmdPtr));*/ Tcl_PushCallFrame(interp, (Tcl_CallFrame *)framePtr, Tcl_CallFrame_nsPtr(varFramePtr), @@ -390,7 +390,7 @@ Nsf_PopFrameCsc(Tcl_Interp *interp, CallFrame *UNUSED(framePtr)) { nonnull_assert(interp != NULL); - /*fprintf(stderr,"POP CMETHOD_FRAME (Nsf_PopFrameCsc) frame %p, varTablePtr = %p\n", + /*fprintf(stderr, "POP CMETHOD_FRAME (Nsf_PopFrameCsc) frame %p, varTablePtr = %p\n", framePtr, Tcl_CallFrame_varTablePtr(framePtr));*/ Tcl_PopCallFrame(interp); } @@ -770,7 +770,7 @@ */ framePtr = CallStackGetActiveProcFrame(inFramePtr); - /*fprintf(stderr,"... use frameptr %p \n", framePtr);*/ + /*fprintf(stderr, "... use frameptr %p \n", framePtr);*/ if (inFramePtr == framePtr) { /* call frame pointers are fine */ @@ -876,7 +876,7 @@ cscPtr = (NsfCallStackContent *)Tcl_CallFrame_clientData(varFramePtr); assert(cscPtr != NULL); - /*fprintf(stderr,"--- frame %p cmdPtr %p NSF_CSC_TYPE_ENSEMBLE %d NSF_CSC_CALL_IS_ENSEMBLE %d \ + /*fprintf(stderr, "--- frame %p cmdPtr %p NSF_CSC_TYPE_ENSEMBLE %d NSF_CSC_CALL_IS_ENSEMBLE %d \ NSF_CSC_TYPE_INACTIVE %d\n", varFramePtr, cscPtr->cmdPtr, @@ -1284,7 +1284,7 @@ * Track object activations. */ object->activationCount ++; - MEM_COUNT_ALLOC("object.activationCount",object); + MEM_COUNT_ALLOC("object.activationCount", object); /*fprintf(stderr, "CscInit %p method %s activationCount ++ (%s) --> %d (cl %p)\n", cscPtr, (cmd != NULL) ? Tcl_GetCommandName(object->teardown, cmd) : "UNK", ObjectName(object), object->activationCount, cl);*/ Index: win/nmakehlp.c =================================================================== diff -u -r24571ae44c492c681d3efd2f2d2f5169ad7d6d57 -r62dc29237e6a643169841f002784c7dc0b29f201 --- win/nmakehlp.c (.../nmakehlp.c) (revision 24571ae44c492c681d3efd2f2d2f5169ad7d6d57) +++ win/nmakehlp.c (.../nmakehlp.c) (revision 62dc29237e6a643169841f002784c7dc0b29f201) @@ -262,7 +262,7 @@ FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS| FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPVOID)&msg[chars], (300-chars), 0); - WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, lstrlen(msg), &err,NULL); + WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, lstrlen(msg), &err, NULL); return 2; } @@ -390,7 +390,7 @@ FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS| FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPVOID)&msg[chars], (300-chars), 0); - WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, lstrlen(msg), &err,NULL); + WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, lstrlen(msg), &err, NULL); return 2; }