core: rename block_fifo_t to vlc_fifo_t

The vlc_fifo_t name already existed and was a typedef to block_fifo_t.

But leave the old block_Fifo/block_fifo_t name via
 - typedef struct vlc_fifo_t block_fifo_t;
 - defines of functions, struct and defines

Refs #18762

include/vlc_block.h

@@ -71,4 +71,13 @@
 #define block_ChainProperties vlc_frame_ChainProperties
 #define block_ChainGather vlc_frame_ChainGather
 
+#define block_FifoPut vlc_fifo_Put
+#define block_FifoNew vlc_fifo_New
+#define block_FifoRelease vlc_fifo_Release
+#define block_FifoSize vlc_fifo_Size
+#define block_FifoGet vlc_fifo_Get
+#define block_FifoCount vlc_fifo_Count
+#define block_FifoEmpty vlc_fifo_Empty
+#define block_FifoShow vlc_fifo_Show
+
 #endif /* VLC_BLOCK_H */

include/vlc_common.h

@@ -425,7 +425,8 @@ typedef struct iso639_lang_t iso639_lang_t;
 
 /* block */
 typedef struct vlc_frame_t  block_t;
-typedef struct block_fifo_t block_fifo_t;
+typedef struct vlc_fifo_t vlc_fifo_t;
+typedef struct vlc_fifo_t block_fifo_t;
 
 /* Hashing */
 typedef struct vlc_hash_md5_ctx vlc_hash_md5_t;

include/vlc_frame.h

@@ -525,21 +525,21 @@ static inline vlc_frame_t *vlc_frame_ChainGather( vlc_frame_t *p_list )
 /**
  * Creates a thread-safe FIFO queue of blocks.
  *
- * See also block_FifoPut() and block_FifoGet().
- * The created queue must be released with block_FifoRelease().
+ * See also vlc_fifo_Put() and vlc_fifo_Get().
+ * The created queue must be released with vlc_fifo_Release().
  *
  * @return the FIFO or NULL on memory error
  */
-VLC_API block_fifo_t *block_FifoNew(void) VLC_USED VLC_MALLOC;
+VLC_API vlc_fifo_t *vlc_fifo_New(void) VLC_USED VLC_MALLOC;
 
 /**
- * Destroys a FIFO created by block_FifoNew().
+ * Destroys a FIFO created by vlc_fifo_New().
  *
  * @note Any queued blocks are also destroyed.
  * @warning No other threads may be using the FIFO when this function is
  * called. Otherwise, undefined behaviour will occur.
  */
-VLC_API void block_FifoRelease(block_fifo_t *);
+VLC_API void vlc_fifo_Release(vlc_fifo_t *);
 
 /**
  * Dequeue the first block from the FIFO. If necessary, wait until there is
@@ -547,7 +547,7 @@ VLC_API void block_FifoRelease(block_fifo_t *);
  *
  * @return a valid block
  */
-VLC_API vlc_frame_t *block_FifoGet(block_fifo_t *) VLC_USED;
+VLC_API vlc_frame_t *vlc_fifo_Get(vlc_fifo_t *) VLC_USED;
 
 /**
  * Peeks the first block in the FIFO.
@@ -560,9 +560,7 @@ VLC_API vlc_frame_t *block_FifoGet(block_fifo_t *) VLC_USED;
  *
  * @return a valid block.
  */
-VLC_API vlc_frame_t *block_FifoShow(block_fifo_t *);
-
-typedef struct block_fifo_t vlc_fifo_t;
+VLC_API vlc_frame_t *vlc_fifo_Show(vlc_fifo_t *);
 
 static inline vlc_queue_t *vlc_fifo_queue(const vlc_fifo_t *fifo)
 {
@@ -722,7 +720,7 @@ static inline void vlc_fifo_Cleanup(void *fifo)
 /**
  * Clears all blocks in a FIFO.
  */
-static inline void block_FifoEmpty(block_fifo_t *fifo)
+static inline void vlc_fifo_Empty(vlc_fifo_t *fifo)
 {
     vlc_frame_t *block;
 
@@ -738,7 +736,7 @@ static inline void block_FifoEmpty(block_fifo_t *fifo)
  * @param fifo queue
  * @param block head of a block list to queue (may be NULL)
  */
-static inline void block_FifoPut(block_fifo_t *fifo, vlc_frame_t *block)
+static inline void vlc_fifo_Put(vlc_fifo_t *fifo, vlc_frame_t *block)
 {
     vlc_fifo_Lock(fifo);
     vlc_fifo_QueueUnlocked(fifo, block);
@@ -747,7 +745,7 @@ static inline void block_FifoPut(block_fifo_t *fifo, vlc_frame_t *block)
 
 /* FIXME: not (really) thread-safe */
 VLC_USED VLC_DEPRECATED
-static inline size_t block_FifoSize (block_fifo_t *fifo)
+static inline size_t vlc_fifo_Size (vlc_fifo_t *fifo)
 {
     size_t size;
 
@@ -759,7 +757,7 @@ static inline size_t block_FifoSize (block_fifo_t *fifo)
 
 /* FIXME: not (really) thread-safe */
 VLC_USED VLC_DEPRECATED
-static inline size_t block_FifoCount (block_fifo_t *fifo)
+static inline size_t vlc_fifo_Count (vlc_fifo_t *fifo)
 {
     size_t depth;
 

src/libvlccore.sym

@@ -36,10 +36,10 @@ vlc_audio_meter_AddPlugin
 vlc_audio_meter_RemovePlugin
 vlc_audio_meter_Process
 vlc_audio_meter_Flush
-block_FifoGet
-block_FifoNew
-block_FifoRelease
-block_FifoShow
+vlc_fifo_Get
+vlc_fifo_New
+vlc_fifo_Release
+vlc_fifo_Show
 vlc_frame_Alloc
 vlc_frame_File
 vlc_frame_FilePath

src/misc/fifo.c

@@ -35,7 +35,7 @@
 /**
  * Internal state for block queues
  */
-struct block_fifo_t
+struct vlc_fifo_t
 {
     vlc_queue_t         q;
     size_t              i_depth;
@@ -44,13 +44,13 @@ struct block_fifo_t
 
 static_assert (offsetof (block_fifo_t, q) == 0, "Problems in <vlc_block.h>");
 
-size_t vlc_fifo_GetCount(const vlc_fifo_t *fifo)
+size_t vlc_fifo_GetCount(const block_fifo_t *fifo)
 {
     vlc_mutex_assert(&fifo->q.lock);
     return fifo->i_depth;
 }
 
-size_t vlc_fifo_GetBytes(const vlc_fifo_t *fifo)
+size_t vlc_fifo_GetBytes(const block_fifo_t *fifo)
 {
     vlc_mutex_assert(&fifo->q.lock);
     return fifo->i_size;
@@ -87,7 +87,7 @@ block_t *vlc_fifo_DequeueAllUnlocked(block_fifo_t *fifo)
     return vlc_queue_DequeueAllUnlocked(&fifo->q);
 }
 
-block_fifo_t *block_FifoNew( void )
+block_fifo_t *vlc_fifo_New( void )
 {
     block_fifo_t *p_fifo = malloc( sizeof( block_fifo_t ) );
 
@@ -100,13 +100,13 @@ block_fifo_t *block_FifoNew( void )
     return p_fifo;
 }
 
-void block_FifoRelease( block_fifo_t *p_fifo )
+void vlc_fifo_Release( block_fifo_t *p_fifo )
 {
-    block_FifoEmpty(p_fifo);
+    vlc_fifo_Empty(p_fifo);
     free( p_fifo );
 }
 
-block_t *block_FifoGet(block_fifo_t *fifo)
+block_t *vlc_fifo_Get(block_fifo_t *fifo)
 {
     block_t *block;
 
@@ -125,7 +125,7 @@ block_t *block_FifoGet(block_fifo_t *fifo)
     return block;
 }
 
-block_t *block_FifoShow( block_fifo_t *p_fifo )
+block_t *vlc_fifo_Show( block_fifo_t *p_fifo )
 {
     block_t *b;