diff mbox series

[FFmpeg-devel,1/6] avformat/aviobuf: Make ff_read_line_to_bprint() static

Message ID AM7PR03MB666071F4CD52F2881F4053448FE59@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit 642b202567d5c18af65a9cf97a46e2ee60084490
Headers show
Series [FFmpeg-devel,1/6] avformat/aviobuf: Make ff_read_line_to_bprint() static
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt July 23, 2021, 4:54 p.m. UTC
It is only used in ff_read_line_to_bprint_overwrite().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/aviobuf.c  |  4 ++--
 libavformat/internal.h | 13 -------------
 2 files changed, 2 insertions(+), 15 deletions(-)

Comments

Andreas Rheinhardt July 28, 2021, 10:22 p.m. UTC | #1
Andreas Rheinhardt:
> It is only used in ff_read_line_to_bprint_overwrite().
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavformat/aviobuf.c  |  4 ++--
>  libavformat/internal.h | 13 -------------
>  2 files changed, 2 insertions(+), 15 deletions(-)
> 
> diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
> index ddfa4ecbf1..66fddf1433 100644
> --- a/libavformat/aviobuf.c
> +++ b/libavformat/aviobuf.c
> @@ -794,7 +794,7 @@ int ff_get_chomp_line(AVIOContext *s, char *buf, int maxlen)
>      return len;
>  }
>  
> -int64_t ff_read_line_to_bprint(AVIOContext *s, AVBPrint *bp)
> +static int64_t read_line_to_bprint(AVIOContext *s, AVBPrint *bp)
>  {
>      int len, end;
>      int64_t read = 0;
> @@ -830,7 +830,7 @@ int64_t ff_read_line_to_bprint_overwrite(AVIOContext *s, AVBPrint *bp)
>      int64_t ret;
>  
>      av_bprint_clear(bp);
> -    ret = ff_read_line_to_bprint(s, bp);
> +    ret = read_line_to_bprint(s, bp);
>      if (ret < 0)
>          return ret;
>  
> diff --git a/libavformat/internal.h b/libavformat/internal.h
> index bff948e9a3..d71852afb9 100644
> --- a/libavformat/internal.h
> +++ b/libavformat/internal.h
> @@ -539,19 +539,6 @@ int ff_get_line(AVIOContext *s, char *buf, int maxlen);
>   */
>  int ff_get_chomp_line(AVIOContext *s, char *buf, int maxlen);
>  
> -/**
> - * Read a whole line of text from AVIOContext to an AVBPrint buffer. Stop
> - * reading after reaching a \\r, a \\n, a \\r\\n, a \\0 or EOF.  The line
> - * ending characters are NOT included in the buffer, but they are skipped on
> - * the input.
> - *
> - * @param s the read-only AVIOContext
> - * @param bp the AVBPrint buffer
> - * @return the length of the read line, not including the line endings,
> - *         negative on error.
> - */
> -int64_t ff_read_line_to_bprint(AVIOContext *s, AVBPrint *bp);
> -
>  /**
>   * Read a whole line of text from AVIOContext to an AVBPrint buffer overwriting
>   * its contents. Stop reading after reaching a \\r, a \\n, a \\r\\n, a \\0 or
> 
Will apply this patchset tomorrow unless there are objections.

- Andreas
diff mbox series

Patch

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index ddfa4ecbf1..66fddf1433 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -794,7 +794,7 @@  int ff_get_chomp_line(AVIOContext *s, char *buf, int maxlen)
     return len;
 }
 
-int64_t ff_read_line_to_bprint(AVIOContext *s, AVBPrint *bp)
+static int64_t read_line_to_bprint(AVIOContext *s, AVBPrint *bp)
 {
     int len, end;
     int64_t read = 0;
@@ -830,7 +830,7 @@  int64_t ff_read_line_to_bprint_overwrite(AVIOContext *s, AVBPrint *bp)
     int64_t ret;
 
     av_bprint_clear(bp);
-    ret = ff_read_line_to_bprint(s, bp);
+    ret = read_line_to_bprint(s, bp);
     if (ret < 0)
         return ret;
 
diff --git a/libavformat/internal.h b/libavformat/internal.h
index bff948e9a3..d71852afb9 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -539,19 +539,6 @@  int ff_get_line(AVIOContext *s, char *buf, int maxlen);
  */
 int ff_get_chomp_line(AVIOContext *s, char *buf, int maxlen);
 
-/**
- * Read a whole line of text from AVIOContext to an AVBPrint buffer. Stop
- * reading after reaching a \\r, a \\n, a \\r\\n, a \\0 or EOF.  The line
- * ending characters are NOT included in the buffer, but they are skipped on
- * the input.
- *
- * @param s the read-only AVIOContext
- * @param bp the AVBPrint buffer
- * @return the length of the read line, not including the line endings,
- *         negative on error.
- */
-int64_t ff_read_line_to_bprint(AVIOContext *s, AVBPrint *bp);
-
 /**
  * Read a whole line of text from AVIOContext to an AVBPrint buffer overwriting
  * its contents. Stop reading after reaching a \\r, a \\n, a \\r\\n, a \\0 or