41
41
#include "asterisk/json.h"
42
42
#include "asterisk/module.h"
43
43
#include "asterisk/test.h"
44
+ #include "asterisk/file.h"
44
45
45
46
#include <stdio.h>
46
47
#include <unistd.h>
@@ -1269,27 +1270,6 @@ static int safe_fclose(FILE *f)
1269
1270
return 0 ;
1270
1271
}
1271
1272
1272
- static FILE * mkstemp_file (char * template , const char * mode )
1273
- {
1274
- int fd = mkstemp (template );
1275
- FILE * file ;
1276
-
1277
- if (fd < 0 ) {
1278
- ast_log (LOG_ERROR , "Failed to create temp file: %s\n" ,
1279
- strerror (errno ));
1280
- return NULL ;
1281
- }
1282
-
1283
- file = fdopen (fd , mode );
1284
- if (!file ) {
1285
- ast_log (LOG_ERROR , "Failed to create temp file: %s\n" ,
1286
- strerror (errno ));
1287
- return NULL ;
1288
- }
1289
-
1290
- return file ;
1291
- }
1292
-
1293
1273
AST_TEST_DEFINE (json_test_dump_load_file )
1294
1274
{
1295
1275
RAII_VAR (struct ast_json * , uut , NULL , ast_json_unref );
@@ -1312,7 +1292,7 @@ AST_TEST_DEFINE(json_test_dump_load_file)
1312
1292
1313
1293
/* dump/load file */
1314
1294
expected = ast_json_pack ("{ s: i }" , "one" , 1 );
1315
- file = mkstemp_file (filename , "w" );
1295
+ file = ast_file_mkftemp (filename , 0644 );
1316
1296
ast_test_validate (test , NULL != file );
1317
1297
uut_res = ast_json_dump_file (expected , file );
1318
1298
ast_test_validate (test , 0 == uut_res );
@@ -1347,7 +1327,7 @@ AST_TEST_DEFINE(json_test_dump_load_new_file)
1347
1327
1348
1328
/* dump/load filename */
1349
1329
expected = ast_json_pack ("{ s: i }" , "one" , 1 );
1350
- file = mkstemp_file (filename , "w" );
1330
+ file = ast_file_mkftemp (filename , 0644 );
1351
1331
ast_test_validate (test , NULL != file );
1352
1332
uut_res = ast_json_dump_new_file (expected , filename );
1353
1333
ast_test_validate (test , 0 == uut_res );
@@ -1378,7 +1358,7 @@ AST_TEST_DEFINE(json_test_dump_load_null)
1378
1358
/* dump/load NULL tests */
1379
1359
uut = ast_json_load_string ("{ \"one\": 1 }" , NULL );
1380
1360
ast_test_validate (test , NULL != uut );
1381
- file = mkstemp_file (filename , "w" );
1361
+ file = ast_file_mkftemp (filename , 0644 );
1382
1362
ast_test_validate (test , NULL != file );
1383
1363
ast_test_validate (test , NULL == ast_json_dump_string (NULL ));
1384
1364
ast_test_validate (test , -1 == ast_json_dump_file (NULL , file ));
0 commit comments