Tcl Source Code

Check-in [06de3274f0]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Another bit more
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | tip-400-impl
Files: files | file ages | folders
SHA1: 06de3274f082dff05185dc78d8f29119a7751f13
User & Date: dkf 2012-04-07 17:41:10
Context
2012-04-08
17:16
Another few bits of zlib stream core hacking check-in: c59fa7ccf4 user: dkf tags: tip-400-impl
2012-04-07
17:41
Another bit more check-in: 06de3274f0 user: dkf tags: tip-400-impl
2012-04-05
16:29
merge trunk check-in: f24817c9e5 user: dkf tags: tip-400-impl
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tclZlib.c.

1875
1876
1877
1878
1879
1880
1881
1882
1883
1884



1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895




1896











1897





1898

1899
1900




1901











1902





1903

1904
1905




1906











1907





1908

1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925




1926
1927

1928
1929
1930
1931
1932
1933
1934
		headerDictObj, TCL_LEAVE_ERR_MSG) == NULL) {
	    if (headerDictObj) {
		TclDecrRefCount(headerDictObj);
	    }
	    return TCL_ERROR;
	}
	return TCL_OK;
    case CMD_STREAM:			/* stream deflate/inflate/...gunzip \
					 *    ?level?
					 *	-> handleCmd */



	if (objc < 3 || objc > 4) {
	    Tcl_WrongNumArgs(interp, 2, objv, "mode ?level?");
	    return TCL_ERROR;
	}
	if (Tcl_GetIndexFromObj(interp, objv[2], stream_formats, "mode", 0,
		&format) != TCL_OK) {
	    return TCL_ERROR;
	}
	mode = TCL_ZLIB_STREAM_INFLATE;
	switch ((enum zlibFormats) format) {
	case FMT_DEFLATE:




	    mode = TCL_ZLIB_STREAM_DEFLATE;











	case FMT_INFLATE:





	    format = TCL_ZLIB_FORMAT_RAW;

	    break;
	case FMT_COMPRESS:




	    mode = TCL_ZLIB_STREAM_DEFLATE;











	case FMT_DECOMPRESS:





	    format = TCL_ZLIB_FORMAT_ZLIB;

	    break;
	case FMT_GZIP:




	    mode = TCL_ZLIB_STREAM_DEFLATE;











	case FMT_GUNZIP:





	    format = TCL_ZLIB_FORMAT_GZIP;

	    break;
	}
	if (objc == 4) {
	    if (Tcl_GetIntFromObj(interp, objv[3],
		    (int *) &level) != TCL_OK) {
		return TCL_ERROR;
	    }
	    if (level < 0 || level > 9) {
		goto badLevel;
	    }
	} else {
	    level = Z_DEFAULT_COMPRESSION;
	}
	if (Tcl_ZlibStreamInit(interp, mode, format, level, NULL,
		&zh) != TCL_OK) {
	    return TCL_ERROR;
	}




	Tcl_SetObjResult(interp, Tcl_ZlibStreamGetCommandName(zh));
	return TCL_OK;

    case CMD_PUSH: {			/* push mode channel options...
					 *	-> channel */
	Tcl_Channel chan;
	int chanMode;
	static const char *const pushOptions[] = {
	    "-header", "-level", "-limit",
	    NULL







|


>
>
>
|
|






<


>
>
>
>

>
>
>
>
>
>
>
>
>
>
>

>
>
>
>
>

>


>
>
>
>

>
>
>
>
>
>
>
>
>
>
>

>
>
>
>
>

>


>
>
>
>

>
>
>
>
>
>
>
>
>
>
>

>
>
>
>
>

>


<
<
<
<
<
<
<
<
<
<
<
|



>
>
>
>


>







1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895

1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975











1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
		headerDictObj, TCL_LEAVE_ERR_MSG) == NULL) {
	    if (headerDictObj) {
		TclDecrRefCount(headerDictObj);
	    }
	    return TCL_ERROR;
	}
	return TCL_OK;
    case CMD_STREAM: {			/* stream deflate/inflate/...gunzip \
					 *    ?level?
					 *	-> handleCmd */
	Tcl_Obj *compDictObj = NULL;
	Tcl_Obj *gzipHeaderObj = NULL;

	if (objc < 3) {
	    Tcl_WrongNumArgs(interp, 2, objv, "mode ?options...?");
	    return TCL_ERROR;
	}
	if (Tcl_GetIndexFromObj(interp, objv[2], stream_formats, "mode", 0,
		&format) != TCL_OK) {
	    return TCL_ERROR;
	}

	switch ((enum zlibFormats) format) {
	case FMT_DEFLATE:
	    if (objc > 4) {
		Tcl_WrongNumArgs(interp, 2, objv, "mode ?level?");
		return TCL_ERROR;
	    }
	    mode = TCL_ZLIB_STREAM_DEFLATE;
	    format = TCL_ZLIB_FORMAT_RAW;
	    level = Z_DEFAULT_COMPRESSION;
	    if (objc == 4) {
		if (Tcl_GetIntFromObj(interp, objv[3], &level) != TCL_OK) {
		    return TCL_ERROR;
		}
		if (level < 0 || level > 9) {
		    goto badLevel;
		}
	    }
	    break;
	case FMT_INFLATE:
	    if (objc > 3) {
		Tcl_WrongNumArgs(interp, 2, objv, "mode");
		return TCL_ERROR;
	    }
	    mode = TCL_ZLIB_STREAM_INFLATE;
	    format = TCL_ZLIB_FORMAT_RAW;
	    level = Z_DEFAULT_COMPRESSION;
	    break;
	case FMT_COMPRESS:
	    if (objc > 4) {
		Tcl_WrongNumArgs(interp, 2, objv, "mode ?level?");
		return TCL_ERROR;
	    }
	    mode = TCL_ZLIB_STREAM_DEFLATE;
	    format = TCL_ZLIB_FORMAT_ZLIB;
	    level = Z_DEFAULT_COMPRESSION;
	    if (objc == 4) {
		if (Tcl_GetIntFromObj(interp, objv[3], &level) != TCL_OK) {
		    return TCL_ERROR;
		}
		if (level < 0 || level > 9) {
		    goto badLevel;
		}
	    }
	    break;
	case FMT_DECOMPRESS:
	    if (objc > 3) {
		Tcl_WrongNumArgs(interp, 2, objv, "mode");
		return TCL_ERROR;
	    }
	    mode = TCL_ZLIB_STREAM_INFLATE;
	    format = TCL_ZLIB_FORMAT_ZLIB;
	    level = Z_DEFAULT_COMPRESSION;
	    break;
	case FMT_GZIP:
	    if (objc > 4) {
		Tcl_WrongNumArgs(interp, 2, objv, "mode ?level?");
		return TCL_ERROR;
	    }
	    mode = TCL_ZLIB_STREAM_DEFLATE;
	    format = TCL_ZLIB_FORMAT_GZIP;
	    level = Z_DEFAULT_COMPRESSION;
	    if (objc == 4) {
		if (Tcl_GetIntFromObj(interp, objv[3], &level) != TCL_OK) {
		    return TCL_ERROR;
		}
		if (level < 0 || level > 9) {
		    goto badLevel;
		}
	    }
	    break;
	case FMT_GUNZIP:
	    if (objc > 3) {
		Tcl_WrongNumArgs(interp, 2, objv, "mode");
		return TCL_ERROR;
	    }
	    mode = TCL_ZLIB_STREAM_INFLATE;
	    format = TCL_ZLIB_FORMAT_GZIP;
	    level = Z_DEFAULT_COMPRESSION;
	    break;
	}











	if (Tcl_ZlibStreamInit(interp, mode, format, level, gzipHeaderObj,
		&zh) != TCL_OK) {
	    return TCL_ERROR;
	}
	if (compDictObj != NULL) {
	    ((ZlibStreamHandle *) zh)->compDictObj = compDictObj;
	    Tcl_IncrRefCount(compDictObj);
	}
	Tcl_SetObjResult(interp, Tcl_ZlibStreamGetCommandName(zh));
	return TCL_OK;
    }
    case CMD_PUSH: {			/* push mode channel options...
					 *	-> channel */
	Tcl_Channel chan;
	int chanMode;
	static const char *const pushOptions[] = {
	    "-header", "-level", "-limit",
	    NULL