| Message ID | 20220627122806.29586-3-dse@thaumatec.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series |
|
| Related | show |
Hi Daniel, On Mon, Jun 27, 2022 at 02:28:06PM +0200, Daniel Semkowicz via libcamera-devel wrote: > parseFrames() return value was ignored. If there was an error during > frame parsing, parsing was not stopped correctly. > > Signed-off-by: Daniel Semkowicz <dse@thaumatec.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> FYI: Laurent has give his RB tag on v2. Patch submitters are expected to collect tags and add them to their next version they send. Thanks j > --- > src/cam/capture_script.cpp | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/src/cam/capture_script.cpp b/src/cam/capture_script.cpp > index 6278a152..695de37b 100644 > --- a/src/cam/capture_script.cpp > +++ b/src/cam/capture_script.cpp > @@ -150,7 +150,9 @@ int CaptureScript::parseScript(FILE *script) > std::string section = eventScalarValue(event); > > if (section == "frames") { > - parseFrames(); > + ret = parseFrames(); > + if (ret) > + return ret; > } else { > std::cerr << "Unsupported section '" << section << "'" > << std::endl; > -- > 2.34.1 >
Hi Jacopo, On Mon, Jun 27, 2022 at 6:10 PM Jacopo Mondi <jacopo@jmondi.org> wrote: > > Hi Daniel, > > On Mon, Jun 27, 2022 at 02:28:06PM +0200, Daniel Semkowicz via libcamera-devel wrote: > > parseFrames() return value was ignored. If there was an error during > > frame parsing, parsing was not stopped correctly. > > > > Signed-off-by: Daniel Semkowicz <dse@thaumatec.com> > > Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> > > FYI: > Laurent has give his RB tag on v2. Patch submitters are expected to > collect tags and add them to their next version they send. > > Thanks > j Thank you for the review. Sorry for the mistakes... It is new to me to push changes using mailing list. I have read some instructions about this way of working, but apparently there are still things that I haven't learned before I came into contact with them in practice. Best regards Daniel > > > --- > > src/cam/capture_script.cpp | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/src/cam/capture_script.cpp b/src/cam/capture_script.cpp > > index 6278a152..695de37b 100644 > > --- a/src/cam/capture_script.cpp > > +++ b/src/cam/capture_script.cpp > > @@ -150,7 +150,9 @@ int CaptureScript::parseScript(FILE *script) > > std::string section = eventScalarValue(event); > > > > if (section == "frames") { > > - parseFrames(); > > + ret = parseFrames(); > > + if (ret) > > + return ret; > > } else { > > std::cerr << "Unsupported section '" << section << "'" > > << std::endl; > > -- > > 2.34.1 > >
Hi Daniel, On Mon, Jun 27, 2022 at 02:28:06PM +0200, Daniel Semkowicz via libcamera-devel wrote: > parseFrames() return value was ignored. If there was an error during > frame parsing, parsing was not stopped correctly. > > Signed-off-by: Daniel Semkowicz <dse@thaumatec.com> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> > --- > src/cam/capture_script.cpp | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/src/cam/capture_script.cpp b/src/cam/capture_script.cpp > index 6278a152..695de37b 100644 > --- a/src/cam/capture_script.cpp > +++ b/src/cam/capture_script.cpp > @@ -150,7 +150,9 @@ int CaptureScript::parseScript(FILE *script) > std::string section = eventScalarValue(event); > > if (section == "frames") { > - parseFrames(); > + ret = parseFrames(); > + if (ret) > + return ret; > } else { > std::cerr << "Unsupported section '" << section << "'" > << std::endl; > -- > 2.34.1 >
diff --git a/src/cam/capture_script.cpp b/src/cam/capture_script.cpp index 6278a152..695de37b 100644 --- a/src/cam/capture_script.cpp +++ b/src/cam/capture_script.cpp @@ -150,7 +150,9 @@ int CaptureScript::parseScript(FILE *script) std::string section = eventScalarValue(event); if (section == "frames") { - parseFrames(); + ret = parseFrames(); + if (ret) + return ret; } else { std::cerr << "Unsupported section '" << section << "'" << std::endl;
parseFrames() return value was ignored. If there was an error during frame parsing, parsing was not stopped correctly. Signed-off-by: Daniel Semkowicz <dse@thaumatec.com> --- src/cam/capture_script.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)