mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-07 06:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

mediaapi/writers/utils: Reorder createFileWriter return parameters for consistency

Browse source
This commit is contained in:
Robert Swain 2017-05-11 14:40:35 +02:00
parent 074e899000
commit a821b9155f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/github.com/matrix-org/dendrite/mediaapi/writers/utils.go
View file

@ -45,7 +45,7 @@ func createTempDir(baseDirectory types.Path) (types.Path, error) {
// createFileWriter creates a buffered file writer with a new file at directory/filename
// Returns the file handle as it needs to be closed when writing is complete
func createFileWriter(directory types.Path, filename types.Filename) (*os.File, *bufio.Writer, error) {
func createFileWriter(directory types.Path, filename types.Filename) (*bufio.Writer, *os.File, error) {
filePath := path.Join(string(directory), string(filename))
file, err := os.Create(filePath)
if err != nil {
@ -53,7 +53,7 @@ func createFileWriter(directory types.Path, filename types.Filename) (*os.File,
return nil, nil, err
}
return file, bufio.NewWriter(file), nil
return bufio.NewWriter(file), file, nil
}
func createTempFileWriter(basePath types.Path, logger *log.Entry) (*bufio.Writer, *os.File, types.Path, *util.JSONResponse) {
@ -65,7 +65,7 @@ func createTempFileWriter(basePath types.Path, logger *log.Entry) (*bufio.Writer
JSON: jsonerror.Unknown(fmt.Sprintf("Failed to upload: %q", err)),
}
}
tmpFile, writer, err := createFileWriter(tmpDir, "content")
writer, tmpFile, err := createFileWriter(tmpDir, "content")
if err != nil {
logger.Infof("Failed to create file writer %q\n", err)
return nil, nil, "", &util.JSONResponse{