From patchwork Sat Oct 21 18:54:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 5640 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp5072759jah; Sat, 21 Oct 2017 12:03:17 -0700 (PDT) X-Received: by 10.28.66.215 with SMTP id k84mr1970103wmi.143.1508612597717; Sat, 21 Oct 2017 12:03:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508612597; cv=none; d=google.com; s=arc-20160816; b=uFpNm/52tBVwIkO8zcuWs5E90eZARs0SBYVLH2k7g/UJKwUIOaLcOBUhTBEfNuTzVd sgsllKt8DtlW4eDqOQiFq4KAeiQ5/QqJIsDAX54pWtVYh/5AuqsiXT90UdEuGwR0d+t5 6VJ5M6irjkSnRNj6DPIkUoa/MTXWRd3ymJa9olnKg2/2jKtGkoEAIpOx0FVfiI31IxTv 6PTDGnPpKLRytcpti4uEyccnNQEv8mSiA7t/CbJpvUjPE/TVWZeD9UkJG0fAmZpSDfQp A++ImN1AudcupuRDP5rOPRaXZ7fTGqyNnf6Lu2KvsLCVMOiICr5HOqpmJyl4ifjkYhvN JNyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=YpTkfnsJDw1MqzhjfHmU2oweiZDxIwze8lYGmj3yNn0=; b=ZDcjpjUVm4JFcelN/YtDwjuNBclfbxY9hitc8G6o0vkLgfdOSDgtiSO7c6lp2Vv6yr 5Y1klHxTXYFwKy3q8skBross0zGyMOOp7qT7Ge24JNrTQ5ugd6NMpAfvTuIi/zOQ7sCl Kx7ttFuTAVo1gFz8BOfPC5vWXzPK0jAKU4zxTSBzFyVmbjnPsygicTFaps2eO8dnRTC7 CW3ZAL+G6VjJj20VynOTX2/YuYl6XjBLe1EiU67H980dqiEpz572H7x92fRAY1da/Rra eLSGMZJrOm+qM7XTiE6QgqKh9cc/WeWTmE6qF5S0sKJ2/KTWDRpXUL/SAhPRs/cq/6/+ kD5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=E0jr7Qzh; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u204si1051342wmg.198.2017.10.21.12.03.17; Sat, 21 Oct 2017 12:03:17 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=E0jr7Qzh; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5363C689A63; Sat, 21 Oct 2017 22:03:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7C93689888 for ; Sat, 21 Oct 2017 22:03:03 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id b189so3046407wmd.4 for ; Sat, 21 Oct 2017 12:03:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8WXNEfARsdi+6rByWsB0O/nK/YhSTe9cla+rUeuDEm4=; b=E0jr7QzhaUncMa9YH79QjZFjk/uowi30/xvYTJ89A61VUGE9zRkpcGHWHrSxhHE1HV +W2sWnCUQEjwvBGE4uyRJRvBovYQ++wuE1dvsicnKm/CPx8wsT7mWjPtwaE8cWR6zHKa gQSkU7utDUKyd7LaBogtUePjTeGa2m3vaHo59giysPWJTHeUTURsVjNtn8l9tVY8Wuw1 5ponQP8T2AiE5t0rLFX1Nbftfuewzy/mJawKWLuKkT5TEyhT3ZVhhKMLefxaPO55Dn5Q g3Vd9jBmMWarUIpq1RIeTMH6Zo5/qGV3A595LM3WRtvli5YAxc9wP1ROrAkyBFYnVZAW FBvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8WXNEfARsdi+6rByWsB0O/nK/YhSTe9cla+rUeuDEm4=; b=nYOff7L1racmD3SpwIAoPhA3BYWk19g87cirMxy8/GxqbOzjR3D5jUC20lucEmt6eZ INTs4Ex7wf+gx/lF4uVnM0cBKBQoPVJItNh82GBB8tiJg5Xv4M+XmKhT4QDEkXbGvl0y JVylV9rtH18Y41lthwp3M0yWpT44wUOig3YErZOtrKcx/iYfqB1rs/TQqeqUA4SzNYGd caqt6/WHivMMp7GfqU7uijovFye5s/G2mwALEROCbQxOO4KQufGT8URXNhsWt0OBY0Xj 1YxjYnQOsAebmozvE/ZU1E9eSGQX3dsLWFN8pbV4pgEfzg33YkNLaoXCBP6R0fjMOMLu urFQ== X-Gm-Message-State: AMCzsaWoIM5WZqeimrGwVn12A1hh1R6AnsbZ9qNaEULV0vixv7ramogK 0jMJjHj9LxpJ2RSsN/pvV/7Jik/n X-Google-Smtp-Source: ABhQp+QQRSjWJHRn+2aXj2unsBTDgiYTiXhIIUeCjETHXTU7jwJkLC4RF0v1ms/TNp8TgFsMj00blA== X-Received: by 10.28.62.145 with SMTP id l139mr1945479wma.150.1508612087215; Sat, 21 Oct 2017 11:54:47 -0700 (PDT) Received: from moonbase.pars.ee (host86-177-182-57.range86-177.btcentralplus.com. [86.177.182.57]) by smtp.gmail.com with ESMTPSA id 76sm1066312wmj.37.2017.10.21.11.54.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Oct 2017 11:54:46 -0700 (PDT) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Oct 2017 19:54:36 +0100 Message-Id: <20171021185439.30693-4-atomnuker@gmail.com> X-Mailer: git-send-email 2.15.0.rc1.287.g2b38de12cc In-Reply-To: <20171021185439.30693-3-atomnuker@gmail.com> References: <20171021185439.30693-1-atomnuker@gmail.com> <20171021185439.30693-2-atomnuker@gmail.com> <20171021185439.30693-3-atomnuker@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/6] libavformat: unexpose the ff_inet_aton function X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Used only by ffserver. Signed-off-by: Rostislav Pehlivanov --- libavformat/libavformat.v | 1 - libavformat/network.h | 2 -- libavformat/os_support.c | 6 +++--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/libavformat/libavformat.v b/libavformat/libavformat.v index c961cd8f19..4edf52f45e 100644 --- a/libavformat/libavformat.v +++ b/libavformat/libavformat.v @@ -2,7 +2,6 @@ LIBAVFORMAT_MAJOR { global: av*; #FIXME those are for ffserver - ff_inet_aton; ff_socket_nonblock; ff_rtsp_parse_line; ff_rtp_get_local_rtp_port; diff --git a/libavformat/network.h b/libavformat/network.h index f83c796a95..5ab858f08d 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -95,8 +95,6 @@ int ff_network_wait_fd(int fd, int write); */ int ff_network_wait_fd_timeout(int fd, int write, int64_t timeout, AVIOInterruptCB *int_cb); -int ff_inet_aton (const char * str, struct in_addr * add); - #if !HAVE_STRUCT_SOCKADDR_STORAGE struct sockaddr_storage { #if HAVE_STRUCT_SOCKADDR_SA_LEN diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 86d0b8f306..dc3bf65f34 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -46,7 +46,7 @@ #if !HAVE_INET_ATON #include -int ff_inet_aton(const char *str, struct in_addr *add) +static int inet_aton(const char *str, struct in_addr *add) { unsigned int add1 = 0, add2 = 0, add3 = 0, add4 = 0; @@ -61,7 +61,7 @@ int ff_inet_aton(const char *str, struct in_addr *add) return 1; } #else -int ff_inet_aton(const char *str, struct in_addr *add) +static int inet_aton(const char *str, struct in_addr *add) { return inet_aton(str, add); } @@ -92,7 +92,7 @@ int ff_getaddrinfo(const char *node, const char *service, sin->sin_family = AF_INET; if (node) { - if (!ff_inet_aton(node, &sin->sin_addr)) { + if (!inet_aton(node, &sin->sin_addr)) { if (hints && (hints->ai_flags & AI_NUMERICHOST)) { av_free(sin); return EAI_FAIL;