diff options
| author | donal.k.fellows@manchester.ac.uk <dkf> | 2012-04-26 13:52:58 (GMT) |
|---|---|---|
| committer | donal.k.fellows@manchester.ac.uk <dkf> | 2012-04-26 13:52:58 (GMT) |
| commit | 559b06ad27d1a68be117a331a2f62219b2daa6f5 (patch) | |
| tree | 502e16aa19987a0abef1d255638a9d39a00bd4ab /generic/tclMain.c | |
| parent | bfcb55a861fe14618d3244a4da3617595e1e2444 (diff) | |
| parent | 16b4e79286e53eb98ef501a25def03233fda42bc (diff) | |
| download | tcl-559b06ad27d1a68be117a331a2f62219b2daa6f5.zip tcl-559b06ad27d1a68be117a331a2f62219b2daa6f5.tar.gz tcl-559b06ad27d1a68be117a331a2f62219b2daa6f5.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclMain.c')
| -rw-r--r-- | generic/tclMain.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/generic/tclMain.c b/generic/tclMain.c index 373e3f6..88b4e51 100644 --- a/generic/tclMain.c +++ b/generic/tclMain.c @@ -53,20 +53,23 @@ #endif /* - * Further on, in UNICODE mode, we need to use Tcl_NewUnicodeObj, - * while otherwise NewNativeObj is needed (which provides proper - * conversion from native encoding to UTF-8). + * Further on, in UNICODE mode we just use Tcl_NewUnicodeObj, otherwise + * NewNativeObj is needed (which provides proper conversion from native + * encoding to UTF-8). */ + #ifdef UNICODE # define NewNativeObj Tcl_NewUnicodeObj #else /* !UNICODE */ - static Tcl_Obj *NewNativeObj(char *string, int length) { - Tcl_Obj *obj; - Tcl_DString ds; - Tcl_ExternalToUtfDString(NULL, string, length, &ds); - obj = Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds)); - Tcl_DStringFree(&ds); - return obj; +static inline Tcl_Obj * +NewNativeObj( + char *string, + int length) +{ + Tcl_DString ds; + + Tcl_ExternalToUtfDString(NULL, string, length, &ds); + return TclDStringToObj(&ds); } #endif /* !UNICODE */ |