aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2019-03-11 15:17:03 (GMT)
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2019-03-11 15:17:03 (GMT)
commit915ab1a6e6141a2171a45f56c23af0a334e005e8 (patch)
tree4659198450950dcccc8dca0ca3d1fd7ca4fcc66c
parent070e0949af9d0b513e27f97d7384063d166ec6d7 (diff)
v4l-utils: then -> than
Fix lots of places where 'than' instead of 'then' should be used. Reported-by: Jason H <jhihn@gmx.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--lib/libv4l1/libv4l1.c4
-rw-r--r--lib/libv4l2/libv4l2.c6
-rw-r--r--lib/libv4l2/v4l2-plugin-android.c4
-rw-r--r--lib/libv4l2/v4l2-plugin.c4
-rw-r--r--lib/libv4lconvert/control/libv4lcontrol.c2
-rw-r--r--lib/libv4lconvert/libv4lconvert.c4
-rw-r--r--lib/libv4lconvert/processing/autogain.c2
-rw-r--r--lib/libv4lconvert/processing/libv4lprocessing.h2
-rw-r--r--lib/libv4lconvert/tinyjpeg.c4
-rw-r--r--utils/dvb/dvbv5-zap.1.in2
-rw-r--r--utils/qv4l2/alsa_stream.c2
-rw-r--r--v4l-utils-po/de.po2
-rw-r--r--v4l-utils-po/pt_BR.po2
13 files changed, 20 insertions, 20 deletions
diff --git a/lib/libv4l1/libv4l1.c b/lib/libv4l1/libv4l1.c
index dab665b..b4efa99 100644
--- a/lib/libv4l1/libv4l1.c
+++ b/lib/libv4l1/libv4l1.c
@@ -370,7 +370,7 @@ int v4l1_open(const char *file, int oflag, ...)
pthread_mutex_unlock(&v4l1_open_mutex);
if (index == V4L1_MAX_DEVICES) {
- V4L1_LOG_ERR("attempting to open more then %d video devices\n",
+ V4L1_LOG_ERR("attempting to open more than %d video devices\n",
V4L1_MAX_DEVICES);
v4l2_close(fd);
errno = EBUSY;
@@ -802,7 +802,7 @@ int v4l1_ioctl(int fd, unsigned long int request, ...)
So the application could be calling VIDIOC_S_FMT, in this case update
our own bookkeeping of the cam's format. Note that this really only is
relevant if an application is mixing and matching v4l1 and v4l2 calls,
- which is crazy, but better safe then sorry. */
+ which is crazy, but better safe than sorry. */
case VIDIOC_S_FMT: {
struct v4l2_format *fmt2 = arg;
diff --git a/lib/libv4l2/libv4l2.c b/lib/libv4l2/libv4l2.c
index 2db25d1..9ebf8c1 100644
--- a/lib/libv4l2/libv4l2.c
+++ b/lib/libv4l2/libv4l2.c
@@ -743,7 +743,7 @@ no_capture:
pthread_mutex_unlock(&v4l2_open_mutex);
if (index == V4L2_MAX_DEVICES) {
- V4L2_LOG_ERR("attempting to open more then %d video devices\n",
+ V4L2_LOG_ERR("attempting to open more than %d video devices\n",
V4L2_MAX_DEVICES);
v4l2_plugin_cleanup(plugin_library, dev_ops_priv, dev_ops);
errno = EBUSY;
@@ -1035,7 +1035,7 @@ static int v4l2_s_fmt(int index, struct v4l2_format *dest_fmt)
if (src_fmt.fmt.pix.width != req_pix_fmt.width ||
src_fmt.fmt.pix.height != req_pix_fmt.height ||
src_fmt.fmt.pix.pixelformat != req_pix_fmt.pixelformat) {
- V4L2_LOG_ERR("set_fmt gave us a different result then try_fmt!\n");
+ V4L2_LOG_ERR("set_fmt gave us a different result than try_fmt!\n");
/* Not what we expected / wanted, disable conversion */
*dest_fmt = src_fmt;
}
@@ -1315,7 +1315,7 @@ no_capture_request:
if (result)
break;
- /* No more buffers then we can manage please */
+ /* No more buffers than we can manage please */
if (req->count > V4L2_MAX_NO_FRAMES)
req->count = V4L2_MAX_NO_FRAMES;
diff --git a/lib/libv4l2/v4l2-plugin-android.c b/lib/libv4l2/v4l2-plugin-android.c
index af7f4ae..c4ebc65 100644
--- a/lib/libv4l2/v4l2-plugin-android.c
+++ b/lib/libv4l2/v4l2-plugin-android.c
@@ -43,8 +43,8 @@
parameters unmodified.
If a plugin is relevant for the specified device node, it can indicate so
- by returning a value other then -1 (the actual file descriptor).
- As soon as a plugin returns another value then -1 plugin loading stops and
+ by returning a value other than -1 (the actual file descriptor).
+ As soon as a plugin returns another value than -1 plugin loading stops and
information about it (fd and corresponding library handle) is stored. For
each function v4l2_[ioctl,read,close,etc] is called corresponding
v4l2_plugin_* function which looks if there is loaded plugin for that file
diff --git a/lib/libv4l2/v4l2-plugin.c b/lib/libv4l2/v4l2-plugin.c
index fbf92d8..ff42eed 100644
--- a/lib/libv4l2/v4l2-plugin.c
+++ b/lib/libv4l2/v4l2-plugin.c
@@ -35,8 +35,8 @@
parameters unmodified.
If a plugin is relevant for the specified device node, it can indicate so
- by returning a value other then -1 (the actual file descriptor).
- As soon as a plugin returns another value then -1 plugin loading stops and
+ by returning a value other than -1 (the actual file descriptor).
+ As soon as a plugin returns another value than -1 plugin loading stops and
information about it (fd and corresponding library handle) is stored. For
each function v4l2_[ioctl,read,close,etc] is called corresponding
v4l2_plugin_* function which looks if there is loaded plugin for that file
diff --git a/lib/libv4lconvert/control/libv4lcontrol.c b/lib/libv4lconvert/control/libv4lcontrol.c
index 793e19f..0b0a346 100644
--- a/lib/libv4lconvert/control/libv4lcontrol.c
+++ b/lib/libv4lconvert/control/libv4lcontrol.c
@@ -881,7 +881,7 @@ int v4lcontrol_vidioc_queryctrl(struct v4lcontrol_data *data, void *arg)
if ((data->priv_flags & V4LCONTROL_SUPPORTS_NEXT_CTRL) &&
(orig_id & V4L2_CTRL_FLAG_NEXT_CTRL)) {
/* If the hardware has no more controls check if we still have any
- fake controls with a higher id then the hardware's highest */
+ fake controls with a higher id than the hardware's highest */
if (retval)
ctrl->id = V4L2_CTRL_ID_MASK;
diff --git a/lib/libv4lconvert/libv4lconvert.c b/lib/libv4lconvert/libv4lconvert.c
index 6a4c66a..e928b97 100644
--- a/lib/libv4lconvert/libv4lconvert.c
+++ b/lib/libv4lconvert/libv4lconvert.c
@@ -366,7 +366,7 @@ int v4lconvert_enum_fmt(struct v4lconvert_data *data, struct v4l2_fmtdesc *fmt)
thus disqualifying a src format which causes the bandwidth to be exceeded,
except when all of them cause this.
- Note grey scale formats start at 20 rather then 1-10, because we want to
+ Note grey scale formats start at 20 rather than 1-10, because we want to
never autoselect them, unless they are the only choice */
static int v4lconvert_get_rank(struct v4lconvert_data *data,
int src_index, int src_width, int src_height,
@@ -1689,7 +1689,7 @@ static void v4lconvert_get_framesizes(struct v4lconvert_data *data,
/* Add this framesize if it is not already in our list */
if (!match) {
if (data->no_framesizes == V4LCONVERT_MAX_FRAMESIZES) {
- fprintf(stderr, "libv4lconvert: warning more framesizes then I can handle!\n");
+ fprintf(stderr, "libv4lconvert: warning more framesizes than I can handle!\n");
return;
}
data->framesizes[data->no_framesizes].type = frmsize.type;
diff --git a/lib/libv4lconvert/processing/autogain.c b/lib/libv4lconvert/processing/autogain.c
index c6866d6..7b4f91f 100644
--- a/lib/libv4lconvert/processing/autogain.c
+++ b/lib/libv4lconvert/processing/autogain.c
@@ -52,7 +52,7 @@ static void autogain_adjust(struct v4l2_queryctrl *ctrl, int *value,
fine grained controls here, as avg_lum has a range of 0 - 255. */
if (accel && abs(steps) >= 3 && ctrl_range > 256)
*value += steps * ctrl->step * (ctrl_range / 256);
- /* If we are of by less then 3, but have a very finegrained control
+ /* If we are of by less than 3, but have a very finegrained control
still speed things up a bit */
else if (accel && ctrl_range > 1024)
*value += steps * ctrl->step * (ctrl_range / 1024);
diff --git a/lib/libv4lconvert/processing/libv4lprocessing.h b/lib/libv4lconvert/processing/libv4lprocessing.h
index c6a4adc..d135a9d 100644
--- a/lib/libv4lconvert/processing/libv4lprocessing.h
+++ b/lib/libv4lconvert/processing/libv4lprocessing.h
@@ -39,7 +39,7 @@ void v4lprocessing_destroy(struct v4lprocessing_data *data);
int v4lprocessing_pre_processing(struct v4lprocessing_data *data);
/* Do the actual processing, this is a nop if v4lprocessing_pre_processing()
- returned 0, or if called more then 1 time after a single
+ returned 0, or if called more than 1 time after a single
v4lprocessing_pre_processing() call. */
void v4lprocessing_processing(struct v4lprocessing_data *data,
unsigned char *buf, const struct v4l2_format *fmt);
diff --git a/lib/libv4lconvert/tinyjpeg.c b/lib/libv4lconvert/tinyjpeg.c
index 01bd409..4d9a1ee 100644
--- a/lib/libv4lconvert/tinyjpeg.c
+++ b/lib/libv4lconvert/tinyjpeg.c
@@ -406,7 +406,7 @@ static void process_Huffman_data_unit(struct jdec_private *priv, int component)
if (j > 64) {
snprintf(priv->error_string, sizeof(priv->error_string),
- "error: more then 63 AC components (%d) in huffman unit\n", (int)j);
+ "error: more than 63 AC components (%d) in huffman unit\n", (int)j);
longjmp(priv->jump_state, -EIO);
}
@@ -1772,7 +1772,7 @@ static int parse_SOS(struct jdec_private *priv, const unsigned char *stream)
priv->flags |= TINYJPEG_FLAGS_PLANAR_JPEG;
#if SANITY_CHECK
else if (priv->flags & TINYJPEG_FLAGS_PLANAR_JPEG)
- error("SOS with more then 1 component while decoding planar JPEG\n");
+ error("SOS with more than 1 component while decoding planar JPEG\n");
#endif
stream += 3;
diff --git a/utils/dvb/dvbv5-zap.1.in b/utils/dvb/dvbv5-zap.1.in
index 2445593..98b294b 100644
--- a/utils/dvb/dvbv5-zap.1.in
+++ b/utils/dvb/dvbv5-zap.1.in
@@ -133,7 +133,7 @@ Adds additional wait time for DISEqC command completion.
Exit after tuning.
.TP
\fB\-X\fR, \fB\-\-low_traffic\fR
-Also shows DVB traffic with less then 1 packet per second.
+Also shows DVB traffic with less than 1 packet per second.
Used only in monitor mode.
.TP
\fB\-?\fR, \fB\-\-help\fR
diff --git a/utils/qv4l2/alsa_stream.c b/utils/qv4l2/alsa_stream.c
index 229aed7..0594482 100644
--- a/utils/qv4l2/alsa_stream.c
+++ b/utils/qv4l2/alsa_stream.c
@@ -385,7 +385,7 @@ static int setparams(snd_pcm_t *phandle, snd_pcm_t *chandle,
/* Note we use twice as much periods for the playback buffer, since we
will get a period size near the requested time and we don't want it to
- end up smaller then the capture buffer as then we could end up blocking
+ end up smaller than the capture buffer as then we could end up blocking
on writing to it. Note we will configure the playback dev to start
playing as soon as it has 2 capture periods worth of data, so this
won't influence latency */
diff --git a/v4l-utils-po/de.po b/v4l-utils-po/de.po
index b861e8a..b283ec2 100644
--- a/v4l-utils-po/de.po
+++ b/v4l-utils-po/de.po
@@ -2158,6 +2158,6 @@ msgstr "DVR-Schnittstelle »%s« kann nun geöffnet werden.\n"
#~ "Zeitüberschreitungsberichte können nicht aktiviert oder deaktiviert "
#~ "werden."
-#~ msgid "also shows DVB traffic with less then 1 packet per second"
+#~ msgid "also shows DVB traffic with less than 1 packet per second"
#~ msgstr ""
#~ "zeigt außerdem DVB-Datenströme mit weniger als einem Paket pro Sekunde"
diff --git a/v4l-utils-po/pt_BR.po b/v4l-utils-po/pt_BR.po
index 69ae05a..9e3f4c7 100644
--- a/v4l-utils-po/pt_BR.po
+++ b/v4l-utils-po/pt_BR.po
@@ -2132,7 +2132,7 @@ msgstr "Interface DVR '%s' pode ser aberta agora\n"
#~ msgid "cannot enable and disable timeout reports"
#~ msgstr "Não é possível habilitar/desabilitar relatos de tempo máximo"
-#~ msgid "also shows DVB traffic with less then 1 packet per second"
+#~ msgid "also shows DVB traffic with less than 1 packet per second"
#~ msgstr ""
#~ "também mostra tráfego de TV digital com menos de 1 pacote/seg nas "
#~ "estatísticas"

Privacy Policy