Просмотр исходного кода

plugins: Use exact types to avoid clang-19 errors

trilkk 3 дней назад
Родитель
Сommit
57c37e4adc

+ 7 - 4
plugins/linux-v4l2/v4l2-helpers.c

@@ -15,6 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <inttypes.h>
+
 #include <sys/mman.h>
 
 #include <util/bmem.h>
@@ -77,18 +79,19 @@ int_fast32_t v4l2_query_all_buffers(int_fast32_t dev, struct v4l2_buffer_data *b
 {
 	struct v4l2_buffer buf;
 
-	blog(LOG_DEBUG, "attempting to read buffer data for %ld buffers", buf_data->count);
+	blog(LOG_DEBUG, "attempting to read buffer data for %" PRIuFAST32 " buffers", buf_data->count);
 
 	for (uint_fast32_t i = 0; i < buf_data->count; i++) {
 		buf.index = i;
 		buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 		buf.memory = V4L2_MEMORY_MMAP;
 		if (v4l2_ioctl(dev, VIDIOC_QUERYBUF, &buf) < 0) {
-			blog(LOG_DEBUG, "failed to read buffer data for buffer #%ld", i);
+			blog(LOG_DEBUG, "failed to read buffer data for buffer #%" PRIuFAST32, i);
 		} else {
 			blog(LOG_DEBUG,
-			     "query buf #%ld info: ts: %06ld buf id #%d, flags 0x%08X, seq #%d, len %d, used %d", i,
-			     buf.timestamp.tv_usec, buf.index, buf.flags, buf.sequence, buf.length, buf.bytesused);
+			     "query buf #%" PRIuFAST32
+			     " info: ts: %06ld buf id #%d, flags 0x%08X, seq #%d, len %d, used %d",
+			     i, buf.timestamp.tv_usec, buf.index, buf.flags, buf.sequence, buf.length, buf.bytesused);
 		}
 	}
 

+ 1 - 1
plugins/rtmp-services/service-specific/nimotv.c

@@ -84,7 +84,7 @@ const char *nimotv_get_ingest(const char *key)
 	curl_free(encoded_key);
 
 	curl_easy_setopt(curl_handle, CURLOPT_URL, uri.array);
-	curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, true);
+	curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 1L);
 	curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 2L);
 	curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, 3L);
 	curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, nimotv_write_cb);

+ 1 - 1
plugins/rtmp-services/service-specific/showroom.c

@@ -113,7 +113,7 @@ struct showroom_ingest *showroom_get_ingest(const char *server, const char *acce
 	dstr_copy(&uri, server);
 	dstr_cat(&uri, access_key);
 	curl_easy_setopt(curl_handle, CURLOPT_URL, uri.array);
-	curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, true);
+	curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 1L);
 	curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 2L);
 	curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, 30L);
 	curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, showroom_write_cb);