Merge branch 'fix-errata' into 'master'

Fix two minor errata

Closes #9

See merge request sane-project/standard!1
master
Ralph Little 2023-10-15 04:52:55 +00:00
commit 896ba2c60a
1 zmienionych plików z 5 dodań i 5 usunięć

10
api.rst
Wyświetl plik

@ -541,8 +541,8 @@ are described in :numref:`tab:valuetype`.
| | | This type is used to group logically related options. A group option | | | | This type is used to group logically related options. A group option |
| | | is in effect up to the point where another group option is encountered | | | | is in effect up to the point where another group option is encountered |
| | | (or up to the end of the option list, if there are no other group | | | | (or up to the end of the option list, if there are no other group |
| | | options). For group options, only members :member:`title` and | | | | options). For group options, only members :member:`title`, |
| | | :member:`type` are valid in the option descriptor. | | | | :member:`desc`, and :member:`type` are valid in the option descriptor. |
+-----------------------------+------+------------------------------------------------------------------------+ +-----------------------------+------+------------------------------------------------------------------------+
.. index:: SANE_Unit .. index:: SANE_Unit
@ -776,7 +776,7 @@ authentication.
:: ::
SANE_Status sane_init (SANE_Int * version_code, SANE_Status sane_init (SANE_Int * version_code,
SANE_Authorization_Callback authorize); SANE_Auth_Callback authorize);
The authorization function may be called by a backend in response to any The authorization function may be called by a backend in response to any
of the following calls: of the following calls:
@ -794,7 +794,7 @@ multi-user system that authenticates users through a login process a
backend could automatically lookup the appropriate password based on backend could automatically lookup the appropriate password based on
resource- and user-name. resource- and user-name.
.. index:: SANE_Authorization_Callback, domain, username, password .. index:: SANE_Authorization_Callback, SANE_Auth_Callback, domain, username, password
The authentication function type has the following declaration: The authentication function type has the following declaration:
@ -803,7 +803,7 @@ The authentication function type has the following declaration:
#define SANE_MAX_USERNAME_LEN 128 #define SANE_MAX_USERNAME_LEN 128
#define SANE_MAX_PASSWORD_LEN 128 #define SANE_MAX_PASSWORD_LEN 128
typedef void (*SANE_Authorization_Callback) typedef void (*SANE_Auth_Callback)
(SANE_String_Const resource, (SANE_String_Const resource,
SANE_Char username[SANE_MAX_USERNAME_LEN], SANE_Char username[SANE_MAX_USERNAME_LEN],
SANE_Char password[SANE_MAX_PASSWORD_LEN]); SANE_Char password[SANE_MAX_PASSWORD_LEN]);