From fcf0e43a4fe06fc3f44fbff96ee42378a479d35f Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Thu, 5 Jul 2012 10:19:00 +0200 Subject: Fix a bug regarding spaces in C function prototypes Thanks to Richard O'Keefe for pointing the bug out. --- lib/erl_docgen/priv/xsl/db_html.xsl | 21 ++++++++++++++++++++- lib/erl_docgen/priv/xsl/db_man.xsl | 26 ++++++++++++++++++++++++-- lib/erl_docgen/priv/xsl/db_pdf.xsl | 20 ++++++++++++++++++-- 3 files changed, 62 insertions(+), 5 deletions(-) diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl index 7cf5465f90..4bc5abb364 100644 --- a/lib/erl_docgen/priv/xsl/db_html.xsl +++ b/lib/erl_docgen/priv/xsl/db_html.xsl @@ -1817,7 +1817,14 @@ -
+ + + + + + + +
@@ -1845,6 +1852,18 @@ + + + + + + + + + + + diff --git a/lib/erl_docgen/priv/xsl/db_man.xsl b/lib/erl_docgen/priv/xsl/db_man.xsl index 5234ba6bd0..33808859c7 100644 --- a/lib/erl_docgen/priv/xsl/db_man.xsl +++ b/lib/erl_docgen/priv/xsl/db_man.xsl @@ -3,7 +3,7 @@ # # %CopyrightBegin% # - # Copyright Ericsson AB 2009-2011. All Rights Reserved. + # Copyright Ericsson AB 2009-2012. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -758,10 +758,32 @@ .B - + + + + + + + + + + + + .br + + + + + + + + + + diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl index bf17406d84..da96052462 100644 --- a/lib/erl_docgen/priv/xsl/db_pdf.xsl +++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl @@ -3,7 +3,7 @@ # # %CopyrightBegin% # - # Copyright Ericsson AB 2009-2011. All Rights Reserved. + # Copyright Ericsson AB 2009-2012. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -1424,7 +1424,13 @@ - + + + + + + + @@ -1432,6 +1438,16 @@ + + + + + + + + + -- cgit v1.2.3 From fe1ce64f4c0fdbc05e7dae1234eb1a878bb2cc99 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Mon, 9 Jul 2012 12:34:08 +0200 Subject: ic: add space before '*' in some function prototypes --- lib/ic/doc/src/ic_clib.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/ic/doc/src/ic_clib.xml b/lib/ic/doc/src/ic_clib.xml index b557c4b5f6..ebeaabae91 100644 --- a/lib/ic/doc/src/ic_clib.xml +++ b/lib/ic/doc/src/ic_clib.xml @@ -4,7 +4,7 @@
- 20032009 + 20032012 Ericsson AB. All Rights Reserved. @@ -41,7 +41,7 @@ - CORBA_Environment*CORBA_Environment_alloc(int inbufsz, int outbufsz) + CORBA_Environment *CORBA_Environment_alloc(int inbufsz, int outbufsz) Allocate environment data.

This function is used to allocate and initiate the @@ -79,14 +79,14 @@ - CORBA_char*CORBA_string_alloc(CORBA_unsigned_long len) + CORBA_char *CORBA_string_alloc(CORBA_unsigned_long len) Allocate a string.

Allocates a (simple) CORBA character string of length len + 1.

 - CORBA_wchar*CORBA_wstring_alloc(CORBA_unsigned_long len) + CORBA_wchar *CORBA_wstring_alloc(CORBA_unsigned_long len) Allocate a wide string.

Allocates a CORBA wide string of length len + 1.

@@ -101,7 +101,7 @@ - CORBA_char*CORBA_exception_id(CORBA_Environment *env) + CORBA_char *CORBA_exception_id(CORBA_Environment *env) Get exception identity.

Returns the exception identity if an exception is set, otherwise @@ -109,7 +109,7 @@ - void*CORBA_exception_value(CORBA_Environment *env) + void *CORBA_exception_value(CORBA_Environment *env) Get exception value.

Returns the exception value, if an exception is set, otherwise @@ -160,7 +160,7 @@ - oe_map_t*oe_merge_maps(oe_map_t *maps, int size) + oe_map_t *oe_merge_maps(oe_map_t *maps, int size) Merge an array of server maps to one single map.

Merge an array of server maps to one single map.

-- cgit v1.2.3 From 23307be619f0768d84464d13d94c8180d806ec49 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Mon, 9 Jul 2012 12:38:00 +0200 Subject: erts: add space before '*' in some function prototypes --- erts/doc/src/erl_driver.xml | 10 +++++----- erts/doc/src/erl_nif.xml | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/erts/doc/src/erl_driver.xml b/erts/doc/src/erl_driver.xml index 4fd74b783e..187c263b60 100644 --- a/erts/doc/src/erl_driver.xml +++ b/erts/doc/src/erl_driver.xml @@ -4,7 +4,7 @@
- 20012011 + 20012012 Ericsson AB. All Rights Reserved. @@ -1067,7 +1067,7 @@ typedef struct ErlIOVec { - ErlDrvBinary*driver_alloc_binary(ErlDrvSizeT size) + ErlDrvBinary *driver_alloc_binary(ErlDrvSizeT size) Allocate a driver binary @@ -1087,7 +1087,7 @@ typedef struct ErlIOVec { - ErlDrvBinary*driver_realloc_binary(ErlDrvBinary *bin, ErlDrvSizeT size) + ErlDrvBinary *driver_realloc_binary(ErlDrvBinary *bin, ErlDrvSizeT size) Resize a driver binary @@ -1277,7 +1277,7 @@ typedef struct ErlIOVec { - SysIOVec*driver_peekq(ErlDrvPort port, int *vlen) + SysIOVec *driver_peekq(ErlDrvPort port, int *vlen) Get the driver queue as a vector @@ -1481,7 +1481,7 @@ typedef struct ErlIOVec { - char*erl_errno_id(int error) + char *erl_errno_id(int error) Get erlang error atom name from error number diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml index 5fc6508aad..f484e9eaf7 100644 --- a/erts/doc/src/erl_nif.xml +++ b/erts/doc/src/erl_nif.xml @@ -4,7 +4,7 @@
- 20012011 + 20012012 Ericsson AB. All Rights Reserved. @@ -472,7 +472,7 @@ typedef enum { - void*enif_alloc(size_t size) + void *enif_alloc(size_t size) Allocate dynamic memory.

Allocate memory of size bytes. Return NULL if allocation failed.

 @@ -489,7 +489,7 @@ typedef enum {

Return true on success or false if allocation failed.

 - ErlNifEnv*enif_alloc_env() + ErlNifEnv *enif_alloc_env() Create a new environment

Allocate a new process independent environment. The environment can be used to hold terms that is not bound to any process. Such terms can @@ -499,7 +499,7 @@ typedef enum {

Return pointer to the new environment.

 - void*enif_alloc_resource(ErlNifResourceType* type, unsigned size) + void *enif_alloc_resource(ErlNifResourceType* type, unsigned size) Allocate a memory managed resource object

Allocate a memory managed resource object of type type and size size bytes.

 @@ -522,7 +522,7 @@ typedef enum {

Same as erl_drv_cond_broadcast.

- ErlNifCond*enif_cond_create(char *name) + ErlNifCond *enif_cond_create(char *name)

Same as erl_drv_cond_create.

@@ -840,7 +840,7 @@ typedef enum { Create an integer term from a long int

Create an integer term from a long int.

 - unsigned char*enif_make_new_binary(ErlNifEnv* env, size_t size, ERL_NIF_TERM* termp) + unsigned char *enif_make_new_binary(ErlNifEnv* env, size_t size, ERL_NIF_TERM* termp) Allocate and create a new binary term

Allocate a binary of size size bytes and create an owning term. The binary data is mutable until the calling NIF returns. This is a @@ -951,7 +951,7 @@ typedef enum { Create an integer term from an unsigned long int

Create an integer term from an unsigned long int.

 - ErlNifMutex*enif_mutex_create(char *name) + ErlNifMutex *enif_mutex_create(char *name)

Same as erl_drv_mutex_create.

@@ -976,7 +976,7 @@ typedef enum {

Same as erl_drv_mutex_unlock.

- ErlNifResourceType*enif_open_resource_type(ErlNifEnv* env, + ErlNifResourceType *enif_open_resource_type(ErlNifEnv* env, const char* module_str, const char* name, ErlNifResourceDtor* dtor, ErlNifResourceFlags flags, ErlNifResourceFlags* tried) Create or takeover a resource type @@ -1005,7 +1005,7 @@ typedef enum { and upgrade.

 - void*enif_priv_data(ErlNifEnv* env) + void *enif_priv_data(ErlNifEnv* env) Get the private data of a NIF library

Return the pointer to the private data that was set by load, reload or upgrade.

@@ -1033,7 +1033,7 @@ typedef enum { References made by enif_make_resource can only be removed by the garbage collector.

 - ErlNifRWLock*enif_rwlock_create(char *name) + ErlNifRWLock *enif_rwlock_create(char *name)

Same as erl_drv_rwlock_create.

@@ -1073,7 +1073,7 @@ typedef enum {

Same as erl_drv_rwlock_tryrwlock.

- ErlNifPid*enif_self(ErlNifEnv* caller_env, ErlNifPid* pid) + ErlNifPid *enif_self(ErlNifEnv* caller_env, ErlNifPid* pid) Get the pid of the calling process.

Initialize the pid variable *pid to represent the calling process. Return pid.

 @@ -1129,7 +1129,7 @@ typedef enum {

Same as erl_drv_thread_join .

- ErlNifThreadOpts*enif_thread_opts_create(char *name) + ErlNifThreadOpts *enif_thread_opts_create(char *name)

Same as erl_drv_thread_opts_create.

@@ -1154,7 +1154,7 @@ typedef enum {

Same as erl_drv_tsd_key_destroy.

- void*enif_tsd_get(ErlNifTSDKey key) + void *enif_tsd_get(ErlNifTSDKey key)

Same as erl_drv_tsd_get.

-- cgit v1.2.3