From 42b949c3dcac97825f83e6bae83221a586ab99d7 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sun, 22 Jan 2017 02:04:54 +0000 Subject: [PATCH] Revert "fix the tempnam warning" This reverts commit 1e49bad4c3fc7bed8a89941c5b6c627327769a45. --- .../shared/core/TemplateDefinitionCompiler.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/engine/shared/application/TemplateDefinitionCompiler/src/shared/core/TemplateDefinitionCompiler.cpp b/engine/shared/application/TemplateDefinitionCompiler/src/shared/core/TemplateDefinitionCompiler.cpp index 2aae0b08..a9af01dd 100755 --- a/engine/shared/application/TemplateDefinitionCompiler/src/shared/core/TemplateDefinitionCompiler.cpp +++ b/engine/shared/application/TemplateDefinitionCompiler/src/shared/core/TemplateDefinitionCompiler.cpp @@ -118,13 +118,10 @@ File fp; return; File temp_fp; - char tmpname[] = "/tmp/templatecompXXXXXX"; - int tmpfd = mkstemp(tmpname); - - if (tmpfd >= 0 && temp_fp.open(tmpname, "wt")) + if (!temp_fp.open(tmpnam(nullptr), "wt")) { fprintf(stderr, "error opening temp file for template header " - "replacement [%s]\n", fp.getFilename().getFullFilename().c_str()); + "replacement [%s]\n", temp_fp.getFilename().getFullFilename().c_str()); return; } @@ -175,7 +172,7 @@ File fp; } else if (temp_fp.puts(buffer) < 0) { - fprintf(stderr, "error writing to temp header file [%s]\n", fp.getFilename().getFullFilename().c_str()); + fprintf(stderr, "error writing to temp header file [%s]\n", temp_fp.getFilename().getFullFilename().c_str()); return; } } @@ -246,11 +243,8 @@ int result; return -1; } - File temp_fp; - char tmpname[] = "/tmp/templatecompXXXXXX"; - int tmpfd = mkstemp(tmpname); - - if (tmpfd >= 0 && temp_fp.open(tmpname, "wt")) + File temp_fp; + if (!temp_fp.open(tmpnam(nullptr), "wt")) { fprintf(stderr, "error opening temp file for template source " "replacement [%s]\n", temp_fp.getFilename().getFullFilename().c_str());