summaryrefslogtreecommitdiff
path: root/backend/pixma/pixma_io.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:24:46 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:24:46 +0100
commitecaaf250cb33ff61f37a7b441f2337584a655350 (patch)
tree4303648095deff998ae20c2393b56db527742ac9 /backend/pixma/pixma_io.h
parent5793a221e112fa49073de0137d6bfa750a61b0a1 (diff)
parent351b7328520c16730ceb46e5acae16038c42185e (diff)
Update upstream source from tag 'upstream/1.0.32'
Update to upstream version '1.0.32' with Debian dir 2c1111c59d9d68bcbf479a4a4de7697fe2de127f
Diffstat (limited to 'backend/pixma/pixma_io.h')
-rw-r--r--backend/pixma/pixma_io.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/backend/pixma/pixma_io.h b/backend/pixma/pixma_io.h
index 715bab5..71202e4 100644
--- a/backend/pixma/pixma_io.h
+++ b/backend/pixma/pixma_io.h
@@ -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.
@@ -128,7 +126,7 @@ int pixma_reset_device (pixma_io_t *);
/** Write data to the device. This function may not be interrupted by signals.
* It will return iff
* - \a len bytes have been successfully written or
- * - an error (inclusive timeout) occured.
+ * - an error (inclusive timeout) occurred.
* .
* \note Calling pixma_write(io, buf, n1) and pixma(io, buf+n1, n2) may
* not be the same as pixma_write(io, buf, n1+n2) if n1 is not
@@ -146,7 +144,7 @@ int pixma_write (pixma_io_t *, const void *cmd, unsigned len);
* It will return iff
* - \a size bytes have been successfully read,
* - a short packet has been read or
- * - an error (inclusive timeout) occured.
+ * - an error (inclusive timeout) occurred.
* .
* \param[out] buf
* \param[in] size of the buffer