Skip to content

Commit 0f7149e

Browse files
committed
Drop remains of a now useless change
1 parent 2f343c1 commit 0f7149e

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

main/streams/php_stream_plain_wrapper.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,9 @@ PHPAPI php_stream *_php_stream_fopen_from_fd(int fd, const char *mode, const cha
3838
PHPAPI php_stream *_php_stream_fopen_from_pipe(FILE *file, const char *mode STREAMS_DC);
3939
#define php_stream_fopen_from_pipe(file, mode) _php_stream_fopen_from_pipe((file), (mode) STREAMS_CC)
4040

41-
PHPAPI php_stream *_php_stream_fopen_tmpfile_ex(bool emit_errors, int dummy STREAMS_DC);
42-
#define php_stream_fopen_tmpfile_ex(emit_errors) _php_stream_fopen_tmpfile_ex((emit_errors), 0 STREAMS_CC)
4341
PHPAPI php_stream *_php_stream_fopen_tmpfile(int dummy STREAMS_DC);
4442
#define php_stream_fopen_tmpfile() _php_stream_fopen_tmpfile(0 STREAMS_CC)
4543

46-
PHPAPI php_stream *_php_stream_fopen_temporary_file_ex(bool emit_errors, const char *dir, const char *pfx, zend_string **opened_path_ptr STREAMS_DC);
47-
#define php_stream_fopen_temporary_file_ex(emit_errors, dir, pfx, opened_path) _php_stream_fopen_temporary_file_ex((emit_errors), (dir), (pfx), (opened_path) STREAMS_CC)
4844
PHPAPI php_stream *_php_stream_fopen_temporary_file(const char *dir, const char *pfx, zend_string **opened_path STREAMS_DC);
4945
#define php_stream_fopen_temporary_file(dir, pfx, opened_path) _php_stream_fopen_temporary_file((dir), (pfx), (opened_path) STREAMS_CC)
5046

main/streams/plain_wrapper.c

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ static php_stream *_php_stream_fopen_from_file_int(FILE *file, const char *mode
213213
return php_stream_alloc_rel(&php_stream_stdio_ops, self, 0, mode);
214214
}
215215

216-
PHPAPI php_stream *_php_stream_fopen_temporary_file_ex(bool emit_errors, const char *dir, const char *pfx, zend_string **opened_path_ptr STREAMS_DC)
216+
PHPAPI php_stream *_php_stream_fopen_temporary_file(const char *dir, const char *pfx, zend_string **opened_path_ptr STREAMS_DC)
217217
{
218218
zend_string *opened_path = NULL;
219219
int fd;
@@ -239,25 +239,13 @@ PHPAPI php_stream *_php_stream_fopen_temporary_file_ex(bool emit_errors, const c
239239
}
240240
close(fd);
241241

242-
if (emit_errors) {
243-
php_error_docref(NULL, E_WARNING, "Unable to allocate stream");
244-
}
242+
php_error_docref(NULL, E_WARNING, "Unable to allocate stream");
245243

246244
return NULL;
247245
}
248246
return NULL;
249247
}
250248

251-
PHPAPI php_stream *_php_stream_fopen_temporary_file(const char *dir, const char *pfx, zend_string **opened_path_ptr STREAMS_DC)
252-
{
253-
return php_stream_fopen_temporary_file_ex(/* emit_errors */ true, dir, pfx, opened_path_ptr);
254-
}
255-
256-
PHPAPI php_stream *_php_stream_fopen_tmpfile_ex(bool emit_errors, int dummy STREAMS_DC)
257-
{
258-
return php_stream_fopen_temporary_file_ex(emit_errors, NULL, "php", NULL);
259-
}
260-
261249
PHPAPI php_stream *_php_stream_fopen_tmpfile(int dummy STREAMS_DC)
262250
{
263251
return php_stream_fopen_temporary_file(NULL, "php", NULL);

0 commit comments

Comments
 (0)