subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1466162 - in /subversion/trunk/subversion: libsvn_delta/path_driver.c libsvn_ra_serf/util.c libsvn_repos/hooks.c libsvn_subr/config.c mod_dav_svn/liveprops.c mod_dav_svn/lock.c mod_dav_svn/mod_dav_svn.c mod_dav_svn/util.c
Date Tue, 09 Apr 2013 18:04:58 GMT
Author: philip
Date: Tue Apr  9 18:04:58 2013
New Revision: 1466162

URL: http://svn.apache.org/r1466162
Log:
Reinstate (void) casts removed in r1464228, r1464060 and r1464058 while
keeping all the other code changes in those revisions.

* subversion/libsvn_delta/path_driver.c
  (pop_stack): Add cast.

* subversion/libsvn_ra_serf/util.c
  (svn_ra_serf__conn_closed, xml_parser_cleanup,
   svn_ra_serf__process_pending, svn_ra_serf__handle_xml_parser,
   svn_ra_serf__credentials_callback, svn_ra_serf__request_create,
   expat_start, expat_end, expat_cdata, expat_response_handler): Add cast.

* subversion/libsvn_repos/hooks.c
  (parse_hooks_env_section, svn_repos__parse_hooks_env): Add cast.

* subversion/libsvn_subr/config.c
  (svn_config_find_group): Add cast.

* subversion/mod_dav_svn/liveprops.c
  (is_writable, dav_svn__insert_all_liveprops): Add cast.

* subversion/mod_dav_svn/lock.c
  (unescape_xml): Add cast.

* subversion/mod_dav_svn/mod_dav_svn.c
  (merge_xml_in_filter): Add cast.

* subversion/mod_dav_svn/util.c
  (dav_svn__final_flush_or_error): Add cast.

Modified:
    subversion/trunk/subversion/libsvn_delta/path_driver.c
    subversion/trunk/subversion/libsvn_ra_serf/util.c
    subversion/trunk/subversion/libsvn_repos/hooks.c
    subversion/trunk/subversion/libsvn_subr/config.c
    subversion/trunk/subversion/mod_dav_svn/liveprops.c
    subversion/trunk/subversion/mod_dav_svn/lock.c
    subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
    subversion/trunk/subversion/mod_dav_svn/util.c

Modified: subversion/trunk/subversion/libsvn_delta/path_driver.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/path_driver.c?rev=1466162&r1=1466161&r2=1466162&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/path_driver.c (original)
+++ subversion/trunk/subversion/libsvn_delta/path_driver.c Tue Apr  9 18:04:58 2013
@@ -96,7 +96,7 @@ pop_stack(apr_array_header_t *db_stack,
 
   /* Close the most recent directory pushed to the stack. */
   item = APR_ARRAY_IDX(db_stack, db_stack->nelts - 1, dir_stack_t *);
-  apr_array_pop(db_stack);
+  (void) apr_array_pop(db_stack);
   SVN_ERR(editor->close_directory(item->dir_baton, item->pool));
   svn_pool_destroy(item->pool);
 

Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=1466162&r1=1466161&r2=1466162&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util.c Tue Apr  9 18:04:58 2013
@@ -497,7 +497,7 @@ svn_ra_serf__conn_closed(serf_connection
 
   err = svn_error_trace(connection_closed(ra_conn, why, pool));
 
-  save_error(ra_conn->session, err);
+  (void) save_error(ra_conn->session, err);
 }
 
 
@@ -1419,7 +1419,7 @@ xml_parser_cleanup(void *baton)
 
   if (*xmlp)
     {
-      XML_ParserFree(*xmlp);
+      (void) XML_ParserFree(*xmlp);
       *xmlp = NULL;
     }
 
@@ -1490,7 +1490,7 @@ svn_ra_serf__process_pending(svn_ra_serf
 
       /* Tell the parser that no more content will be parsed. Ignore the
          return status. We just don't care.  */
-      XML_Parse(parser->xmlp, NULL, 0, 1);
+      (void) XML_Parse(parser->xmlp, NULL, 0, 1);
 
       apr_pool_cleanup_run(parser->pool, &parser->xmlp, xml_parser_cleanup);
       parser->xmlp = NULL;
@@ -1711,7 +1711,7 @@ svn_ra_serf__handle_xml_parser(serf_requ
               SVN_ERR_ASSERT(ctx->xmlp != NULL);
 
               /* Ignore the return status. We just don't care.  */
-              XML_Parse(ctx->xmlp, NULL, 0, 1);
+              (void) XML_Parse(ctx->xmlp, NULL, 0, 1);
 
               apr_pool_cleanup_run(ctx->pool, &ctx->xmlp, xml_parser_cleanup);
               add_done_item(ctx);
@@ -1763,7 +1763,7 @@ svn_ra_serf__credentials_callback(char *
 
       if (err)
         {
-          save_error(session, err);
+          (void) save_error(session, err);
           return err->apr_err;
         }
 
@@ -1772,8 +1772,8 @@ svn_ra_serf__credentials_callback(char *
       if (!creds || session->auth_attempts > 4)
         {
           /* No more credentials. */
-          save_error(session,
-                     svn_error_create(
+          (void) save_error(session,
+                            svn_error_create(
                               SVN_ERR_AUTHN_FAILED, NULL,
                               _("No more credentials or we tried too many "
                                 "times.\nAuthentication failed")));
@@ -1794,8 +1794,8 @@ svn_ra_serf__credentials_callback(char *
       if (!session->proxy_username || session->proxy_auth_attempts > 4)
         {
           /* No more credentials. */
-          save_error(session, 
-                     svn_error_create(
+          (void) save_error(session, 
+                            svn_error_create(
                               SVN_ERR_AUTHN_FAILED, NULL,
                               _("Proxy authentication failed")));
           return SVN_ERR_AUTHN_FAILED;
@@ -2217,8 +2217,8 @@ svn_ra_serf__request_create(svn_ra_serf_
 
   /* ### do we need to hold onto the returned request object, or just
      ### not worry about it (the serf ctx will manage it).  */
-  serf_connection_request_create(handler->conn->conn,
-                                 setup_request_cb, handler);
+  (void) serf_connection_request_create(handler->conn->conn,
+                                        setup_request_cb, handler);
 }
 
 
@@ -2446,7 +2446,7 @@ expat_start(void *userData, const char *
 
 #ifdef EXPAT_HAS_STOPPARSER
   if (ectx->inner_error)
-    XML_StopParser(ectx->parser, 0 /* resumable */);
+    (void) XML_StopParser(ectx->parser, 0 /* resumable */);
 #endif
 }
 
@@ -2465,7 +2465,7 @@ expat_end(void *userData, const char *ra
 
 #ifdef EXPAT_HAS_STOPPARSER
   if (ectx->inner_error)
-    XML_StopParser(ectx->parser, 0 /* resumable */);
+    (void) XML_StopParser(ectx->parser, 0 /* resumable */);
 #endif
 }
 
@@ -2484,7 +2484,7 @@ expat_cdata(void *userData, const char *
 
 #ifdef EXPAT_HAS_STOPPARSER
   if (ectx->inner_error)
-    XML_StopParser(ectx->parser, 0 /* resumable */);
+    (void) XML_StopParser(ectx->parser, 0 /* resumable */);
 #endif
 }
 
@@ -2570,7 +2570,7 @@ expat_response_handler(serf_request_t *r
         {
           /* Tell expat we've reached the end of the content. Ignore the
              return status. We just don't care.  */
-          XML_Parse(ectx->parser, NULL, 0, 1 /* isFinal */);
+          (void) XML_Parse(ectx->parser, NULL, 0, 1 /* isFinal */);
 
           svn_ra_serf__xml_context_destroy(ectx->xmlctx);
           apr_pool_cleanup_run(ectx->cleanup_pool, &ectx->parser,

Modified: subversion/trunk/subversion/libsvn_repos/hooks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/hooks.c?rev=1466162&r1=1466161&r2=1466162&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/hooks.c (original)
+++ subversion/trunk/subversion/libsvn_repos/hooks.c Tue Apr  9 18:04:58 2013
@@ -405,7 +405,7 @@ parse_hooks_env_section(const char *name
   bo.section = name;
   bo.hooks_env = b->hooks_env;
 
-  svn_config_enumerate2(b->cfg, name, parse_hooks_env_option, &bo, pool);
+  (void)svn_config_enumerate2(b->cfg, name, parse_hooks_env_option, &bo, pool);
 
   return TRUE;
 }
@@ -424,8 +424,8 @@ svn_repos__parse_hooks_env(apr_hash_t **
       SVN_ERR(svn_config_read2(&cfg, local_abspath, FALSE, TRUE, scratch_pool));
       b.cfg = cfg;
       b.hooks_env = apr_hash_make(result_pool);
-      svn_config_enumerate_sections2(cfg, parse_hooks_env_section, &b,
-                                     scratch_pool);
+      (void)svn_config_enumerate_sections2(cfg, parse_hooks_env_section, &b,
+                                           scratch_pool);
       *hooks_env_p = b.hooks_env;
     }
   else

Modified: subversion/trunk/subversion/libsvn_subr/config.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/config.c?rev=1466162&r1=1466161&r2=1466162&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/config.c (original)
+++ subversion/trunk/subversion/libsvn_subr/config.c Tue Apr  9 18:04:58 2013
@@ -1012,7 +1012,7 @@ const char *svn_config_find_group(svn_co
   gb.key = key;
   gb.match = NULL;
   gb.pool = pool;
-  svn_config_enumerate2(cfg, master_section, search_groups, &gb, pool);
+  (void) svn_config_enumerate2(cfg, master_section, search_groups, &gb, pool);
   return gb.match;
 }
 

Modified: subversion/trunk/subversion/mod_dav_svn/liveprops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/liveprops.c?rev=1466162&r1=1466161&r2=1466162&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/liveprops.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/liveprops.c Tue Apr  9 18:04:58 2013
@@ -836,7 +836,7 @@ is_writable(const dav_resource *resource
 {
   const dav_liveprop_spec *info = NULL;
 
-  dav_get_liveprop_info(propid, &dav_svn__liveprop_group, &info);
+  (void) dav_get_liveprop_info(propid, &dav_svn__liveprop_group, &info);
   return info ? info->is_writable : FALSE;
 }
 
@@ -962,8 +962,8 @@ dav_svn__insert_all_liveprops(request_re
   for (spec = props; spec->name != NULL; ++spec)
     {
       svn_pool_clear(iterpool);
-      insert_prop_internal(resource, spec->propid, what, phdr,
-                           resource->pool, iterpool);
+      (void) insert_prop_internal(resource, spec->propid, what, phdr,
+                                  resource->pool, iterpool);
     }
   svn_pool_destroy(iterpool);
 

Modified: subversion/trunk/subversion/mod_dav_svn/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/lock.c?rev=1466162&r1=1466161&r2=1466162&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/lock.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/lock.c Tue Apr  9 18:04:58 2013
@@ -145,7 +145,7 @@ unescape_xml(const char **output,
       char errbuf[1024];
 
       errbuf[0] = '\0';
-      apr_xml_parser_geterror(xml_parser, errbuf, sizeof(errbuf));
+      (void)apr_xml_parser_geterror(xml_parser, errbuf, sizeof(errbuf));
       return dav_svn__new_error(pool, HTTP_INTERNAL_SERVER_ERROR,
                                 DAV_ERR_LOCK_SAVE_LOCK, errbuf);
     }

Modified: subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c?rev=1466162&r1=1466161&r2=1466162&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c Tue Apr  9 18:04:58 2013
@@ -1041,7 +1041,7 @@ merge_xml_in_filter(ap_filter_t *f,
       if (rv != APR_SUCCESS)
         {
           /* Clean up the parser. */
-          apr_xml_parser_done(ctx->parser, NULL);
+          (void) apr_xml_parser_done(ctx->parser, NULL);
           break;
         }
     }

Modified: subversion/trunk/subversion/mod_dav_svn/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/util.c?rev=1466162&r1=1466161&r2=1466162&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/util.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/util.c Tue Apr  9 18:04:58 2013
@@ -622,7 +622,7 @@ dav_svn__final_flush_or_error(request_re
     {
       /* Ask about the length of the bucket brigade, ignoring errors. */
       apr_off_t len = 0;
-      apr_brigade_length(bb, FALSE, &len);
+      (void)apr_brigade_length(bb, FALSE, &len);
       do_flush = (len != 0);
     }
 



Mime
View raw message