You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2013/07/12 04:41:36 UTC
svn commit: r1502411 - in /subversion/trunk: ./ subversion/include/private/
subversion/libsvn_client/ subversion/libsvn_ra_serf/
subversion/libsvn_ra_svn/ subversion/svnadmin/ subversion/svnserve/
Author: danielsh
Date: Fri Jul 12 02:41:35 2013
New Revision: 1502411
URL: http://svn.apache.org/r1502411
Log:
Silence some compiler warnings.
* configure.ac
(--enable-maintainer-mode): Suppress -Wstring-plus-int.
* subversion/include/private/svn_ra_svn_private.h
* subversion/libsvn_ra_svn/marshal.c
(svn_ra_svn__write_data_log_entry): Change type of a parameter to match what
the caller has.
* subversion/svnserve/serve.c
(log_receiver): Avoid up- then down-casting an integer.
* subversion/libsvn_client/merge.c
(find_gaps_in_merge_source_history): Use the correct variant of abs().
* subversion/libsvn_ra_serf/property.c
(parse_status_code, propfind_closed): Since we use a function that returns
an int64 to parse, just use a 64-bit return type, too. That avoids
an implicit downcast.
* subversion/svnadmin/svnadmin.c
(subcommand_info): Use the correct integer type.
Modified:
subversion/trunk/configure.ac
subversion/trunk/subversion/include/private/svn_ra_svn_private.h
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_ra_serf/property.c
subversion/trunk/subversion/libsvn_ra_svn/marshal.c
subversion/trunk/subversion/svnadmin/svnadmin.c
subversion/trunk/subversion/svnserve/serve.c
Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1502411&r1=1502410&r2=1502411&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Fri Jul 12 02:41:35 2013
@@ -1025,6 +1025,7 @@ AS_HELP_STRING([--enable-maintainer-mode
SVN_CFLAGS_ADD_IFELSE([-Wold-style-definition])
SVN_CFLAGS_ADD_IFELSE([-Wno-system-headers])
SVN_CFLAGS_ADD_IFELSE([-Wno-format-nonliteral])
+ SVN_CFLAGS_ADD_IFELSE([-Wno-string-plus-int])
CMAINTAINERFLAGS="$CFLAGS $CMAINTAINERFLAGS"
CFLAGS="$CFLAGS_KEEP"
Modified: subversion/trunk/subversion/include/private/svn_ra_svn_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_ra_svn_private.h?rev=1502411&r1=1502410&r2=1502411&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_ra_svn_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_ra_svn_private.h Fri Jul 12 02:41:35 2013
@@ -875,7 +875,7 @@ svn_ra_svn__write_data_log_entry(svn_ra_
const svn_string_t *message,
svn_boolean_t has_children,
svn_boolean_t invalid_revnum,
- int revprop_count);
+ unsigned revprop_count);
/**
* @}
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1502411&r1=1502410&r2=1502411&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Jul 12 02:41:35 2013
@@ -4740,7 +4740,7 @@ find_gaps_in_merge_source_history(svn_re
*gap_start = *gap_end = SVN_INVALID_REVNUM;
/* Easy out: There can't be a gap between adjacent revisions. */
- if (abs(source->loc1->rev - source->loc2->rev) == 1)
+ if (labs(source->loc1->rev - source->loc2->rev) == 1)
return SVN_NO_ERROR;
/* Get SOURCE as mergeinfo. */
Modified: subversion/trunk/subversion/libsvn_ra_serf/property.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/property.c?rev=1502411&r1=1502410&r2=1502411&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/property.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/property.c Fri Jul 12 02:41:35 2013
@@ -143,7 +143,7 @@ static const int propfind_expected_statu
/* Return the HTTP status code contained in STATUS_LINE, or 0 if
there's a problem parsing it. */
-static int parse_status_code(const char *status_line)
+static apr_int64_t parse_status_code(const char *status_line)
{
/* STATUS_LINE should be of form: "HTTP/1.1 200 OK" */
if (status_line[0] == 'H' &&
@@ -261,7 +261,7 @@ propfind_closed(svn_ra_serf__xml_estate_
that we wish to ignore. (Typically, if it's not a 200, the
status will be 404 to indicate that a property we
specifically requested from the server doesn't exist.) */
- int status = parse_status_code(cdata->data);
+ apr_int64_t status = parse_status_code(cdata->data);
if (status != 200)
svn_ra_serf__xml_note(xes, PROPSTAT, "ignore-prop", "*");
}
Modified: subversion/trunk/subversion/libsvn_ra_svn/marshal.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/marshal.c?rev=1502411&r1=1502410&r2=1502411&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/marshal.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/marshal.c Fri Jul 12 02:41:35 2013
@@ -2428,7 +2428,7 @@ svn_ra_svn__write_data_log_entry(svn_ra_
const svn_string_t *message,
svn_boolean_t has_children,
svn_boolean_t invalid_revnum,
- int revprop_count)
+ unsigned revprop_count)
{
SVN_ERR(write_tuple_revision(conn, pool, revision));
SVN_ERR(write_tuple_start_list(conn, pool));
Modified: subversion/trunk/subversion/svnadmin/svnadmin.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1502411&r1=1502410&r2=1502411&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/svnadmin.c (original)
+++ subversion/trunk/subversion/svnadmin/svnadmin.c Fri Jul 12 02:41:35 2013
@@ -1810,9 +1810,9 @@ subcommand_info(apr_getopt_t *os, void *
if (fsfs_info->shard_size)
{
const int shard_size = fsfs_info->shard_size;
- const int shards_packed = fsfs_info->min_unpacked_rev / shard_size;
- const int shards_full = (youngest + 1) / shard_size;
- SVN_ERR(svn_cmdline_printf(pool, _("FSFS Shards Packed: %d/%d\n"),
+ const long shards_packed = fsfs_info->min_unpacked_rev / shard_size;
+ const long shards_full = (youngest + 1) / shard_size;
+ SVN_ERR(svn_cmdline_printf(pool, _("FSFS Shards Packed: %ld/%ld\n"),
shards_packed, shards_full));
}
}
Modified: subversion/trunk/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=1502411&r1=1502410&r2=1502411&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/serve.c (original)
+++ subversion/trunk/subversion/svnserve/serve.c Fri Jul 12 02:41:35 2013
@@ -2092,7 +2092,7 @@ static svn_error_t *log_receiver(void *b
apr_hash_index_t *h;
svn_boolean_t invalid_revnum = FALSE;
const svn_string_t *author, *date, *message;
- apr_uint64_t revprop_count;
+ unsigned revprop_count;
if (log_entry->revision == SVN_INVALID_REVNUM)
{