aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <henrik@erlang.org>2011-05-02 15:44:29 +0200
committerHenrik Nord <henrik@erlang.org>2011-05-02 15:45:20 +0200
commit8d74122d8ee9eb46bfb49c13ec39f515996a58a2 (patch)
tree6adf15ad3ad9c23b49a666b4d27eca86971604a8
parent0e752dde5e322373055c810386353e1d2cc61836 (diff)
parent4380605cd282d1a54afa26add33e3c666eacfcbc (diff)
downloadotp-8d74122d8ee9eb46bfb49c13ec39f515996a58a2.tar.gz
otp-8d74122d8ee9eb46bfb49c13ec39f515996a58a2.tar.bz2
otp-8d74122d8ee9eb46bfb49c13ec39f515996a58a2.zip
Merge branch 'ta/driver_entry-typo' into dev
* ta/driver_entry-typo: driver_entry: Remove gratuitous paren and fix typo OTP-9254
-rw-r--r--erts/doc/src/driver_entry.xml4
-rw-r--r--erts/emulator/beam/erl_driver.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/erts/doc/src/driver_entry.xml b/erts/doc/src/driver_entry.xml
index 7860d83d83..8bdd154cb9 100644
--- a/erts/doc/src/driver_entry.xml
+++ b/erts/doc/src/driver_entry.xml
@@ -133,7 +133,7 @@ typedef struct erl_drv_entry {
int (*control)(ErlDrvData drv_data, unsigned int command, char *buf,
int len, char **rbuf, int rlen);
/* "ioctl" for drivers - invoked by
- port_control/3) */
+ port_control/3 */
void (*timeout)(ErlDrvData drv_data); /* Handling of timeout in driver */
void (*outputv)(ErlDrvData drv_data, ErlIOVec *ev);
/* called when we have output from erlang
@@ -146,7 +146,7 @@ typedef struct erl_drv_entry {
before 'stop' can be called */
int (*call)(ErlDrvData drv_data, unsigned int command, char *buf,
int len, char **rbuf, int rlen, unsigned int *flags);
- /* Works mostly like 'control', a syncronous
+ /* Works mostly like 'control', a synchronous
call into the driver. */
void (*event)(ErlDrvData drv_data, ErlDrvEvent event,
ErlDrvEventData event_data);
diff --git a/erts/emulator/beam/erl_driver.h b/erts/emulator/beam/erl_driver.h
index 3c0eade0d8..069b71ab0d 100644
--- a/erts/emulator/beam/erl_driver.h
+++ b/erts/emulator/beam/erl_driver.h
@@ -294,7 +294,7 @@ typedef struct erl_drv_entry {
int (*control)(ErlDrvData drv_data, unsigned int command, char *buf,
int len, char **rbuf, int rlen);
/* "ioctl" for drivers - invoked by
- port_control/3) */
+ port_control/3 */
void (*timeout)(ErlDrvData drv_data); /* Handling of timeout in driver */
void (*outputv)(ErlDrvData drv_data, ErlIOVec *ev);
/* called when we have output from erlang
@@ -307,7 +307,7 @@ typedef struct erl_drv_entry {
before 'stop' can be called */
int (*call)(ErlDrvData drv_data, unsigned int command, char *buf,
int len, char **rbuf, int rlen, unsigned int *flags);
- /* Works mostly like 'control', a syncronous
+ /* Works mostly like 'control', a synchronous
call into the driver. */
void (*event)(ErlDrvData drv_data, ErlDrvEvent event,
ErlDrvEventData event_data);