summaryrefslogtreecommitdiff
path: root/backend/gt68xx_shm_channel.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2021-05-18 07:43:35 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2021-05-18 07:43:35 +0200
commit9f8889f928ce86ba4a78659d378c6ba29bc9f735 (patch)
treec9567cb0d015b68ce3da8d03472b6443f1cb1ca9 /backend/gt68xx_shm_channel.c
parent446e9454b8cbe5b689149415d11d36e88442ca88 (diff)
parent154785ab2d5df7ddc8c2cf813b773c340e5e2aea (diff)
Merge branch 'release/debian/1.0.32-1'debian/1.0.32-1
Diffstat (limited to 'backend/gt68xx_shm_channel.c')
-rw-r--r--backend/gt68xx_shm_channel.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/backend/gt68xx_shm_channel.c b/backend/gt68xx_shm_channel.c
index 496a959..99ce240 100644
--- a/backend/gt68xx_shm_channel.c
+++ b/backend/gt68xx_shm_channel.c
@@ -15,9 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
As a special exception, the authors of SANE give permission for
additional uses of the libraries contained in this release of SANE.
@@ -342,7 +340,7 @@ shm_channel_writer_init (Shm_Channel * shm_channel)
* This function may block waiting for a free buffer (if the reader process
* does not process the data fast enough).
*
- * After successfull call to this function the writer process should fill the
+ * After successful call to this function the writer process should fill the
* buffer with the data and pass the buffer identifier from @a buffer_id_return
* to shm_channel_writer_put_buffer() to give the buffer to the reader process.
*
@@ -355,7 +353,7 @@ shm_channel_writer_init (Shm_Channel * shm_channel)
* waiting for it); @a buffer_id_return and @a buffer_addr_return are filled
* with valid values.
* - SANE_STATUS_EOF - the reader process has closed its half of the channel.
- * - SANE_STATUS_IO_ERROR - an I/O error occured.
+ * - SANE_STATUS_IO_ERROR - an I/O error occurred.
*/
SANE_Status
shm_channel_writer_get_buffer (Shm_Channel * shm_channel,
@@ -399,7 +397,7 @@ shm_channel_writer_get_buffer (Shm_Channel * shm_channel,
* @return
* - SANE_STATUS_GOOD - the buffer was successfully queued.
* - SANE_STATUS_IO_ERROR - the reader process has closed its half of the
- * channel, or another I/O error occured.
+ * channel, or another I/O error occurred.
*/
SANE_Status
shm_channel_writer_put_buffer (Shm_Channel * shm_channel,
@@ -573,7 +571,7 @@ shm_channel_reader_start (Shm_Channel * shm_channel)
* Otherwise, @a *buffer_id_return, @a *buffer_addr_return and @a
* *buffer_bytes return are filled with valid values.
* - SANE_STATUS_EOF - the writer process has closed its half of the channel.
- * - SANE_STATUS_IO_ERROR - an I/O error occured.
+ * - SANE_STATUS_IO_ERROR - an I/O error occurred.
*/
SANE_Status
shm_channel_reader_get_buffer (Shm_Channel * shm_channel,
@@ -627,7 +625,7 @@ shm_channel_reader_get_buffer (Shm_Channel * shm_channel,
* @return
* - SANE_STATUS_GOOD - the buffer was successfully released.
* - SANE_STATUS_IO_ERROR - the writer process has closed its half of the
- * channel, or an unexpected I/O error occured.
+ * channel, or an unexpected I/O error occurred.
*/
SANE_Status
shm_channel_reader_put_buffer (Shm_Channel * shm_channel, SANE_Int buffer_id)