You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

54 lines
1.8 KiB

  1. From ff469d3a11409e9b043dc10ddfc44792c5359ff1 Mon Sep 17 00:00:00 2001
  2. From: Michael Heimpold <mhei@heimpold.de>
  3. Date: Thu, 14 Jul 2016 01:47:05 +0200
  4. Subject: [PATCH 14/16] Add missing changes from changed stream API interface
  5. Signed-off-by: Michael Heimpold <mhei@heimpold.de>
  6. ---
  7. dio_posix.c | 2 +-
  8. dio_stream_wrappers.c | 2 +-
  9. php_dio_common.h | 2 +-
  10. 3 files changed, 3 insertions(+), 3 deletions(-)
  11. diff --git a/dio_posix.c b/dio_posix.c
  12. index 843e234..b2aa228 100644
  13. --- a/dio_posix.c
  14. +++ b/dio_posix.c
  15. @@ -632,7 +632,7 @@ int dio_serial_purge(php_dio_stream_data *data) {
  16. /* {{{ dio_serial_open_stream
  17. * Opens the underlying stream.
  18. */
  19. -int dio_serial_open_stream(char *filename, char *mode, php_dio_stream_data *data) {
  20. +int dio_serial_open_stream(const char *filename, const char *mode, php_dio_stream_data *data) {
  21. php_dio_posix_stream_data *pdata = (php_dio_posix_stream_data*)data;
  22. #ifdef O_NOCTTY
  23. diff --git a/dio_stream_wrappers.c b/dio_stream_wrappers.c
  24. index eb23752..0a00daa 100644
  25. --- a/dio_stream_wrappers.c
  26. +++ b/dio_stream_wrappers.c
  27. @@ -292,7 +292,7 @@ static php_stream *dio_serial_fopen_wrapper(php_stream_wrapper *wrapper,
  28. {
  29. php_dio_stream_data *data;
  30. php_stream *stream;
  31. - char *filename;
  32. + const char *filename;
  33. /* Check it was actually for us (not a corrupted function pointer
  34. somewhere!). */
  35. diff --git a/php_dio_common.h b/php_dio_common.h
  36. index 6af202f..7068ea7 100644
  37. --- a/php_dio_common.h
  38. +++ b/php_dio_common.h
  39. @@ -61,7 +61,7 @@ int dio_serial_uninit(php_dio_stream_data *data);
  40. int dio_serial_purge(php_dio_stream_data *data);
  41. -int dio_serial_open_stream(char *filename, char *mode, php_dio_stream_data *data);
  42. +int dio_serial_open_stream(const char *filename, const char *mode, php_dio_stream_data *data);
  43. #endif /* PHP_DIO_COMMON_H_ */
  44. --
  45. 2.5.0