diff options
| author | dgp <dgp@users.sourceforge.net> | 2005-05-03 18:07:34 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2005-05-03 18:07:34 (GMT) |
| commit | 8f1d72dfe0e08b09f9985440a5e4f682804224ed (patch) | |
| tree | b6fcb467e2e876bcc285aba2c7258bb0988cbe54 /unix | |
| parent | 76995b15620ca1eecef253001cd60a1a961b6605 (diff) | |
| download | tcl-8f1d72dfe0e08b09f9985440a5e4f682804224ed.zip tcl-8f1d72dfe0e08b09f9985440a5e4f682804224ed.tar.gz tcl-8f1d72dfe0e08b09f9985440a5e4f682804224ed.tar.bz2 | |
* doc/DString.3: Eliminated use of identifier "string" in Tcl's
* doc/Environment.3: public C API to avoid conflict/confusion with
* doc/Eval.3: the std::string of C++.
* doc/ExprLong.3, doc/ExprLongObj.3, doc/GetInt.3, doc/GetOpnFl.3:
* doc/ParseCmd.3, doc/RegExp.3, doc/SetResult.3, doc/StrMatch.3:
* doc/Utf.3, generic/tcl.decls, generic/tclBasic.c, generic/tclEnv.c:
* generic/tclGet.c, generic/tclParse.c, generic/tclParseExpr.c:
* generic/tclRegexp.c, generic/tclResult.c, generic/tclUtf.c:
* generic/tclUtil.c, unix/tclUnixChan.c:
* generic/tclDecls.h: `make genstubs`
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tclUnixChan.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c index 6d3bd12..57a12d0 100644 --- a/unix/tclUnixChan.c +++ b/unix/tclUnixChan.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUnixChan.c,v 1.54 2005/01/27 00:23:31 andreas_kupries Exp $ + * RCS: @(#) $Id: tclUnixChan.c,v 1.55 2005/05/03 18:08:23 dgp Exp $ */ #include "tclInt.h" /* Internal definitions for Tcl. */ @@ -3033,9 +3033,9 @@ TclpGetDefaultStdChannel(type) */ int -Tcl_GetOpenFile(interp, string, forWriting, checkUsage, filePtr) +Tcl_GetOpenFile(interp, chanID, forWriting, checkUsage, filePtr) Tcl_Interp *interp; /* Interpreter in which to find file. */ - CONST char *string; /* String that identifies file. */ + CONST char *chanID; /* String that identifies file. */ int forWriting; /* 1 means the file is going to be used * for writing, 0 means for reading. */ int checkUsage; /* 1 means verify that the file was opened @@ -3052,17 +3052,17 @@ Tcl_GetOpenFile(interp, string, forWriting, checkUsage, filePtr) int fd; FILE *f; - chan = Tcl_GetChannel(interp, string, &chanMode); + chan = Tcl_GetChannel(interp, chanID, &chanMode); if (chan == (Tcl_Channel) NULL) { return TCL_ERROR; } if ((forWriting) && ((chanMode & TCL_WRITABLE) == 0)) { Tcl_AppendResult(interp, - "\"", string, "\" wasn't opened for writing", (char *) NULL); + "\"", chanID, "\" wasn't opened for writing", (char *) NULL); return TCL_ERROR; } else if ((!(forWriting)) && ((chanMode & TCL_READABLE) == 0)) { Tcl_AppendResult(interp, - "\"", string, "\" wasn't opened for reading", (char *) NULL); + "\"", chanID, "\" wasn't opened for reading", (char *) NULL); return TCL_ERROR; } @@ -3092,7 +3092,7 @@ Tcl_GetOpenFile(interp, string, forWriting, checkUsage, filePtr) f = fdopen(fd, (forWriting ? "w" : "r")); if (f == NULL) { - Tcl_AppendResult(interp, "cannot get a FILE * for \"", string, + Tcl_AppendResult(interp, "cannot get a FILE * for \"", chanID, "\"", (char *) NULL); return TCL_ERROR; } @@ -3101,7 +3101,7 @@ Tcl_GetOpenFile(interp, string, forWriting, checkUsage, filePtr) } } - Tcl_AppendResult(interp, "\"", string, + Tcl_AppendResult(interp, "\"", chanID, "\" cannot be used to get a FILE *", (char *) NULL); return TCL_ERROR; } |