svn commit: r1739625 - in /subversion/trunk/tools/dev/svnmover: linenoise/linenoise.c scanlog.c svnmover.c

[br...@apache.org]

Author: brane
Date: Sun Apr 17 16:24:20 2016
New Revision: 1739625

URL: http://svn.apache.org/viewvc?rev=1739625&view=rev
Log:
Silence compiler warnings in svnmover.

* tools/dev/svnmover/linenoise/linenoise.c:
   Add a conditional pragma to silence Apple's -Wshorten-64-to-32 warning.

* tools/dev/svnmover/scanlog.c (scan_moves_log_receiver_baton, copy_info):
   Add missing typedef keywords so that the compiler doesn't think that
   these are global-scope variable declarations.

* tools/dev/svnmover/svnmover.c (do_put_file):
   Do not use the deprecated svn_stream_for_stdin().

Modified:
    subversion/trunk/tools/dev/svnmover/linenoise/linenoise.c
    subversion/trunk/tools/dev/svnmover/scanlog.c
    subversion/trunk/tools/dev/svnmover/svnmover.c

Modified: subversion/trunk/tools/dev/svnmover/linenoise/linenoise.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/svnmover/linenoise/linenoise.c?rev=1739625&r1=1739624&r2=1739625&view=diff
==============================================================================
--- subversion/trunk/tools/dev/svnmover/linenoise/linenoise.c (original)
+++ subversion/trunk/tools/dev/svnmover/linenoise/linenoise.c Sun Apr 17 16:24:20 2016
@@ -103,6 +103,14 @@
  *
  */
 
+/* Tell the compiler to be quiet about implicit conversions from
+   [s]size_t to int. */
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)
+#  if defined(__APPLE_CC__) || defined(__clang__)
+#    pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#  endif
+#endif
+
 #include <termios.h>
 #include <unistd.h>
 #include <stdlib.h>

Modified: subversion/trunk/tools/dev/svnmover/scanlog.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/svnmover/scanlog.c?rev=1739625&r1=1739624&r2=1739625&view=diff
==============================================================================
--- subversion/trunk/tools/dev/svnmover/scanlog.c (original)
+++ subversion/trunk/tools/dev/svnmover/scanlog.c Sun Apr 17 16:24:20 2016
@@ -119,7 +119,7 @@ svn_client__format_move_chain_for_displa
   return s;
 }
 
-struct scan_moves_log_receiver_baton {
+typedef struct scan_moves_log_receiver_baton {
   /*const char *anchor_abspath;*/
   svn_client_ctx_t *ctx;
   svn_revnum_t start;
@@ -162,7 +162,7 @@ struct scan_moves_log_receiver_baton {
   apr_hash_t *moves_by_target_path;
 } scan_moves_log_receiver_baton;
 
-struct copy_info {
+typedef struct copy_info {
   const char *copyto_path;
   const char *copyfrom_path;
   svn_revnum_t copyfrom_rev;

Modified: subversion/trunk/tools/dev/svnmover/svnmover.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/svnmover/svnmover.c?rev=1739625&r1=1739624&r2=1739625&view=diff
==============================================================================
--- subversion/trunk/tools/dev/svnmover/svnmover.c (original)
+++ subversion/trunk/tools/dev/svnmover/svnmover.c Sun Apr 17 16:24:20 2016
@@ -2434,7 +2434,7 @@ do_put_file(svn_branch__txn_t *txn,
       SVN_ERR(svn_stream_open_readonly(&src, local_file_path,
                                        scratch_pool, scratch_pool));
     else
-      SVN_ERR(svn_stream_for_stdin(&src, scratch_pool));
+      SVN_ERR(svn_stream_for_stdin2(&src, FALSE, scratch_pool));
 
     svn_stringbuf_from_stream(&text, src, 0, scratch_pool);
   }