diff options
| author | Patrik Nyblom <[email protected]> | 2011-01-13 16:17:57 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-01-13 16:18:02 +0100 |
| commit | 3b7fd1030711ad56fa45d18dc6e0f1d0beee2399 (patch) | |
| tree | b4659c2f392214afb342ad70870a2420f4e6fd82 | |
| parent | ac360e9814880585d8674d8c1404649d98e97ff5 (diff) | |
| parent | a1a83039a77d39f7691969503d190cb6dfcd49c9 (diff) | |
| download | otp-3b7fd1030711ad56fa45d18dc6e0f1d0beee2399.tar.gz otp-3b7fd1030711ad56fa45d18dc6e0f1d0beee2399.tar.bz2 otp-3b7fd1030711ad56fa45d18dc6e0f1d0beee2399.zip | |
Merge branch 'pan/fortify-source-gcc-4.5' into dev
* pan/fortify-source-gcc-4.5:
Remove strange name field in efile_drv.c as it upsets -D_FORTIFY_SOURCE
OTP-9025
| -rw-r--r-- | erts/emulator/drivers/common/efile_drv.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c index 786fa7da77..6449c6f506 100644 --- a/erts/emulator/drivers/common/efile_drv.c +++ b/erts/emulator/drivers/common/efile_drv.c @@ -385,7 +385,6 @@ struct t_data ErlDrvBinary *binp; int size; int offset; - char name[1]; } read_file; struct { struct t_readdir_buf *first_buf; @@ -1117,7 +1116,7 @@ static void invoke_read_file(void *data) Sint64 size; if (! (d->result_ok = - efile_openfile(&d->errInfo, d->c.read_file.name, + efile_openfile(&d->errInfo, d->b, EFILE_MODE_READ, &fd, &size))) { goto done; } @@ -3071,7 +3070,7 @@ file_outputv(ErlDrvData e, ErlIOVec *ev) { d->command = command; d->reply = !0; /* Copy name */ - FILENAME_COPY(d->c.read_file.name, filename); + FILENAME_COPY(d->b, filename); d->c.read_file.binp = NULL; d->invoke = invoke_read_file; d->free = free_read_file; |