diff mbox series

[FFmpeg-devel,v2,1/3] avformat/avio: move ff_rename implementation from internal.h to avio.c

Message ID 20200108233842.28098-1-cus@passwd.hu
State New
Headers show
Series [FFmpeg-devel,v2,1/3] avformat/avio: move ff_rename implementation from internal.h to avio.c
Related show

Checks

Context Check Description
andriy/ffmpeg-patchwork pending
andriy/ffmpeg-patchwork success Applied patch
andriy/ffmpeg-patchwork success Configure finished
andriy/ffmpeg-patchwork success Make finished
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Marton Balint Jan. 8, 2020, 11:38 p.m. UTC
Signed-off-by: Marton Balint <cus@passwd.hu>
---
 libavformat/avio.c     | 15 +++++++++++++++
 libavformat/internal.h | 14 +-------------
 2 files changed, 16 insertions(+), 13 deletions(-)

Comments

Marton Balint Jan. 18, 2020, 11:08 p.m. UTC | #1
On Thu, 9 Jan 2020, Marton Balint wrote:

> Signed-off-by: Marton Balint <cus@passwd.hu>
> ---
> libavformat/avio.c     | 15 +++++++++++++++
> libavformat/internal.h | 14 +-------------
> 2 files changed, 16 insertions(+), 13 deletions(-)

Ping, will apply the series soon.

Regards,
Marton

>
> diff --git a/libavformat/avio.c b/libavformat/avio.c
> index 2dd2312296..8c2c85f171 100644
> --- a/libavformat/avio.c
> +++ b/libavformat/avio.c
> @@ -26,6 +26,7 @@
> #include "libavutil/avassert.h"
> #include "os_support.h"
> #include "avformat.h"
> +#include "internal.h"
> #if CONFIG_NETWORK
> #include "network.h"
> #endif
> @@ -665,3 +666,17 @@ int ff_check_interrupt(AVIOInterruptCB *cb)
>         return cb->callback(cb->opaque);
>     return 0;
> }
> +
> +int ff_rename(const char *oldpath, const char *newpath, void *logctx)
> +{
> +    int ret = 0;
> +    if (rename(oldpath, newpath) == -1) {
> +        ret = AVERROR(errno);
> +        if (logctx) {
> +            char err[AV_ERROR_MAX_STRING_SIZE] = {0};
> +            av_make_error_string(err, AV_ERROR_MAX_STRING_SIZE, ret);
> +            av_log(logctx, AV_LOG_ERROR, "failed to rename file %s to %s: %s\n", oldpath, newpath, err);
> +        }
> +    }
> +    return ret;
> +}
> diff --git a/libavformat/internal.h b/libavformat/internal.h
> index ec9a29907a..da09983083 100644
> --- a/libavformat/internal.h
> +++ b/libavformat/internal.h
> @@ -586,19 +586,7 @@ int ff_stream_encode_params_copy(AVStream *dst, const AVStream *src);
>  * @param newpath destination path
>  * @return        0 or AVERROR on failure
>  */
> -static inline int ff_rename(const char *oldpath, const char *newpath, void *logctx)
> -{
> -    int ret = 0;
> -    if (rename(oldpath, newpath) == -1) {
> -        ret = AVERROR(errno);
> -        if (logctx) {
> -            char err[AV_ERROR_MAX_STRING_SIZE] = {0};
> -            av_make_error_string(err, AV_ERROR_MAX_STRING_SIZE, ret);
> -            av_log(logctx, AV_LOG_ERROR, "failed to rename file %s to %s: %s\n", oldpath, newpath, err);
> -        }
> -    }
> -    return ret;
> -}
> +int ff_rename(const char *oldpath, const char *newpath, void *logctx);
> 
> /**
>  * Allocate extradata with additional AV_INPUT_BUFFER_PADDING_SIZE at end
> -- 
> 2.16.4
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Marton Balint Jan. 19, 2020, 9:36 p.m. UTC | #2
On Sun, 19 Jan 2020, Marton Balint wrote:

>
>
> On Thu, 9 Jan 2020, Marton Balint wrote:
>
>> Signed-off-by: Marton Balint <cus@passwd.hu>
>> ---
>> libavformat/avio.c     | 15 +++++++++++++++
>> libavformat/internal.h | 14 +-------------
>> 2 files changed, 16 insertions(+), 13 deletions(-)
>
> Ping, will apply the series soon.

Applied.

Regards,
Marton

>>
>> diff --git a/libavformat/avio.c b/libavformat/avio.c
>> index 2dd2312296..8c2c85f171 100644
>> --- a/libavformat/avio.c
>> +++ b/libavformat/avio.c
>> @@ -26,6 +26,7 @@
>> #include "libavutil/avassert.h"
>> #include "os_support.h"
>> #include "avformat.h"
>> +#include "internal.h"
>> #if CONFIG_NETWORK
>> #include "network.h"
>> #endif
>> @@ -665,3 +666,17 @@ int ff_check_interrupt(AVIOInterruptCB *cb)
>>         return cb->callback(cb->opaque);
>>     return 0;
>> }
>> +
>> +int ff_rename(const char *oldpath, const char *newpath, void *logctx)
>> +{
>> +    int ret = 0;
>> +    if (rename(oldpath, newpath) == -1) {
>> +        ret = AVERROR(errno);
>> +        if (logctx) {
>> +            char err[AV_ERROR_MAX_STRING_SIZE] = {0};
>> +            av_make_error_string(err, AV_ERROR_MAX_STRING_SIZE, ret);
>> +            av_log(logctx, AV_LOG_ERROR, "failed to rename file %s to %s: 
> %s\n", oldpath, newpath, err);
>> +        }
>> +    }
>> +    return ret;
>> +}
>> diff --git a/libavformat/internal.h b/libavformat/internal.h
>> index ec9a29907a..da09983083 100644
>> --- a/libavformat/internal.h
>> +++ b/libavformat/internal.h
>> @@ -586,19 +586,7 @@ int ff_stream_encode_params_copy(AVStream *dst, const 
> AVStream *src);
>>  * @param newpath destination path
>>  * @return        0 or AVERROR on failure
>>  */
>> -static inline int ff_rename(const char *oldpath, const char *newpath, void 
> *logctx)
>> -{
>> -    int ret = 0;
>> -    if (rename(oldpath, newpath) == -1) {
>> -        ret = AVERROR(errno);
>> -        if (logctx) {
>> -            char err[AV_ERROR_MAX_STRING_SIZE] = {0};
>> -            av_make_error_string(err, AV_ERROR_MAX_STRING_SIZE, ret);
>> -            av_log(logctx, AV_LOG_ERROR, "failed to rename file %s to %s: 
> %s\n", oldpath, newpath, err);
>> -        }
>> -    }
>> -    return ret;
>> -}
>> +int ff_rename(const char *oldpath, const char *newpath, void *logctx);
>> 
>> /**
>>  * Allocate extradata with additional AV_INPUT_BUFFER_PADDING_SIZE at end
>> -- 
>> 2.16.4
>>
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel@ffmpeg.org
>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>> To unsubscribe, visit link above, or email
>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff mbox series

Patch

diff --git a/libavformat/avio.c b/libavformat/avio.c
index 2dd2312296..8c2c85f171 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -26,6 +26,7 @@ 
 #include "libavutil/avassert.h"
 #include "os_support.h"
 #include "avformat.h"
+#include "internal.h"
 #if CONFIG_NETWORK
 #include "network.h"
 #endif
@@ -665,3 +666,17 @@  int ff_check_interrupt(AVIOInterruptCB *cb)
         return cb->callback(cb->opaque);
     return 0;
 }
+
+int ff_rename(const char *oldpath, const char *newpath, void *logctx)
+{
+    int ret = 0;
+    if (rename(oldpath, newpath) == -1) {
+        ret = AVERROR(errno);
+        if (logctx) {
+            char err[AV_ERROR_MAX_STRING_SIZE] = {0};
+            av_make_error_string(err, AV_ERROR_MAX_STRING_SIZE, ret);
+            av_log(logctx, AV_LOG_ERROR, "failed to rename file %s to %s: %s\n", oldpath, newpath, err);
+        }
+    }
+    return ret;
+}
diff --git a/libavformat/internal.h b/libavformat/internal.h
index ec9a29907a..da09983083 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -586,19 +586,7 @@  int ff_stream_encode_params_copy(AVStream *dst, const AVStream *src);
  * @param newpath destination path
  * @return        0 or AVERROR on failure
  */
-static inline int ff_rename(const char *oldpath, const char *newpath, void *logctx)
-{
-    int ret = 0;
-    if (rename(oldpath, newpath) == -1) {
-        ret = AVERROR(errno);
-        if (logctx) {
-            char err[AV_ERROR_MAX_STRING_SIZE] = {0};
-            av_make_error_string(err, AV_ERROR_MAX_STRING_SIZE, ret);
-            av_log(logctx, AV_LOG_ERROR, "failed to rename file %s to %s: %s\n", oldpath, newpath, err);
-        }
-    }
-    return ret;
-}
+int ff_rename(const char *oldpath, const char *newpath, void *logctx);
 
 /**
  * Allocate extradata with additional AV_INPUT_BUFFER_PADDING_SIZE at end