Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r2479 - branches/fsvs-1.2.x/fsvs: . src

fsvs
Discussion topic

Back to topic list

svn commit: r2479 - branches/fsvs-1.2.x/fsvs: . src

Author pmarek
Full name P.Marek
Date 2015-12-28 03:48:09 PST
Message Author: pmarek
Date: 2015-12-28 03:48:09-0800
New Revision: 2479

Modified:
   branches/fsvs-1.2.x/​fsvs/CHANGES
   branches/fsvs-1.2.x/​fsvs/src/diff.c
   branches/fsvs-1.2.x/​fsvs/src/est_ops.c
   branches/fsvs-1.2.x/​fsvs/src/global.h
   branches/fsvs-1.2.x/​fsvs/src/helper.c
   branches/fsvs-1.2.x/​fsvs/src/props.c
   branches/fsvs-1.2.x/​fsvs/src/props.h
   branches/fsvs-1.2.x/​fsvs/src/racallback.​c
   branches/fsvs-1.2.x/​fsvs/src/revert.c
   branches/fsvs-1.2.x/​fsvs/src/sync.c

Log:
Fixed compiler warnings.

Modified: branches/fsvs-1.2.x/​fsvs/CHANGES
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/branches/fsvs-1.2.​x/fsvs/CHANGES?view=​diff&pathrev=247​9&r1=2478&r2​=2479
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/CHANGES (original)
+++ branches/fsvs-1.2.x/​fsvs/CHANGES 2015-12-28 03:48:09-0800
@@ -1,5 +1,6 @@
 Changes since 1.2.6
 - Updates for Clang
+- Fixed some compiler warnings
 
 Changes in 1.2.6
 - Updates for GCC 5

Modified: branches/fsvs-1.2.x/​fsvs/src/diff.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/branches/fsvs-1.2.​x/fsvs/src/diff.c?vi​ew=diff&pathrev=​2479&r1=2478​&r2=2479
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/diff.c (original)
+++ branches/fsvs-1.2.x/​fsvs/src/diff.c 2015-12-28 03:48:09-0800
@@ -515,7 +515,7 @@
 int df___direct_diff(struct estat *sts)
 {
     int status;
- svn_revnum_t rev1, rev2;
+ svn_revnum_t rev1;
     char *fn;
 
 
@@ -528,7 +528,6 @@
 
         /* Has to be set per sts. */
         rev1=sts->repos_rev;
- rev2=0;
         if ( (sts->entry_status & FS_REMOVED))
         {
             STOPIF_CODE_EPIPE( printf("Only in repository: %s\n", fn), NULL);

Modified: branches/fsvs-1.2.x/​fsvs/src/est_ops.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/branches/fsvs-1.2.​x/fsvs/src/est_ops.c​?view=diff&pathr​ev=2479&r1=2478​&r2=2479
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/est_ops.c (original)
+++ branches/fsvs-1.2.x/​fsvs/src/est_ops.c 2015-12-28 03:48:09-0800
@@ -1023,6 +1023,8 @@
 
         prev=&free_p->next;
         free_p2=free_p;
+ /* silence compiler warning */
+ (void) free_p2;
 
         free_p=*prev;
 
@@ -1231,7 +1233,6 @@
     int status;
     char *next_part;
     struct estat *sts;
- int quit;
     char *copy, *path;
 
 
@@ -1239,7 +1240,6 @@
     STOPIF( hlp__strdup( &copy, fullpath), NULL);
     path=copy;
 
- quit=0;
     while (path)
     {
         next_part=(char*)ops​___split_fnpart(path​);

Modified: branches/fsvs-1.2.x/​fsvs/src/global.h
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/branches/fsvs-1.2.​x/fsvs/src/global.h?​view=diff&pathre​v=2479&r1=2478​&r2=2479
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/global.h (original)
+++ branches/fsvs-1.2.x/​fsvs/src/global.h 2015-12-28 03:48:09-0800
@@ -19,6 +19,7 @@
 #include <sys/types.h>
 #include <apr_md5.h>
 #include <apr_file_io.h>
+#include <apr_version.h>
 #include <subversion-1/svn_ra.h>
 #include <subversion-1/svn​_string.h>
 #include <pcre.h>

Modified: branches/fsvs-1.2.x/​fsvs/src/helper.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/branches/fsvs-1.2.​x/fsvs/src/helper.c?​view=diff&pathre​v=2479&r1=2478​&r2=2479
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/helper.c (original)
+++ branches/fsvs-1.2.x/​fsvs/src/helper.c 2015-12-28 03:48:09-0800
@@ -1271,6 +1271,9 @@
     STOPIF_CODE_ERR(!WIFEXITED(i), ECANCELED,
             "The command '%s' didn't exit normally", command);
 
+ /* Silence compiler warning. */
+ (void) status;
+
     /* Don't do parent cleanups, just quit. */
     _exit(0);
 ex:
@@ -1309,8 +1312,6 @@
 
 
     DEBUGP("encode filter: %s", command);
- status=0;
-
     STOPIF( hlp__alloc( &encoder, sizeof(*encoder)), NULL);
 
     new_str=svn_stream_c​reate(encoder, pool);

Modified: branches/fsvs-1.2.x/​fsvs/src/props.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/branches/fsvs-1.2.​x/fsvs/src/props.c?v​iew=diff&pathrev​=2479&r1=2478​&r2=2479
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/props.c (original)
+++ branches/fsvs-1.2.x/​fsvs/src/props.c 2015-12-28 03:48:09-0800
@@ -442,11 +442,11 @@
 
 /** -.
  * Wrapper for prp__fetch(). */
-int prp__get(hash_t db, char * const keycp, datum *value)
+int prp__get(hash_t db, const char * const keycp, datum *value)
 {
   static datum key;
 
- key.dptr=keycp;
+ key.dptr=(char*)keycp;
     key.dsize=strlen(keycp)+1;
     return prp__fetch(db, key, value);
 }

Modified: branches/fsvs-1.2.x/​fsvs/src/props.h
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/branches/fsvs-1.2.​x/fsvs/src/props.h?v​iew=diff&pathrev​=2479&r1=2478​&r2=2479
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/props.h (original)
+++ branches/fsvs-1.2.x/​fsvs/src/props.h 2015-12-28 03:48:09-0800
@@ -63,7 +63,7 @@
         hash_t *db);
 /** Get a value, addressed by a string; key length is calculated inclusive
  * the \c \\0. */
-int prp__get(hash_t db, char * const keycp, datum *value);
+int prp__get(hash_t db, const char * const keycp, datum *value);
 /** Store the value; basic function. */
 int prp__store(hash_t db, datum key, datum value);
 /** Get first key. */

Modified: branches/fsvs-1.2.x/​fsvs/src/racallback.​c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/branches/fsvs-1.2.​x/fsvs/src/racallbac​k.c?view=diff&pa​threv=2479&r1=24​78&r2=2479
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/racallback.​c (original)
+++ branches/fsvs-1.2.x/​fsvs/src/racallback.​c 2015-12-28 03:48:09-0800
@@ -535,7 +535,6 @@
         void **file_baton)
 {
     struct estat *dir=parent_baton;
- struct estat *sts;
     int status;
 
     /* Unless we get the svn:special property, we can assume that it's a
@@ -543,7 +542,6 @@
     STOPIF( cb__add_entry(dir, utf8_path, NULL, utf8_copy_path,
                 copy_rev, S_IFREG, NULL, 1, file_baton),
             NULL);
- sts=*file_baton;
 
 ex:
     RETURN_SVNERR(status);
@@ -917,7 +915,6 @@
     svn_error_t *status_svn;
     void *report_baton;
     const svn_ra_reporter2_t *reporter;
- int sent_wcroot;
     char *cur, **op;
 
 
@@ -934,7 +931,6 @@
              root,
              pool) );
 
- sent_wcroot=0;
     cur=NULL;
     op=NULL;
     if (other_paths)

Modified: branches/fsvs-1.2.x/​fsvs/src/revert.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/branches/fsvs-1.2.​x/fsvs/src/revert.c?​view=diff&pathre​v=2479&r1=2478​&r2=2479
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/revert.c (original)
+++ branches/fsvs-1.2.x/​fsvs/src/revert.c 2015-12-28 03:48:09-0800
@@ -191,7 +191,7 @@
     svn_error_t *status_svn;
     svn_string_t *prop_val;
     struct encoder_t *encoder;
- char *relative_url, *utf8_url;
+ char *utf8_url;
     apr_hash_t *properties;
     char target_rev[10];
 
@@ -205,7 +205,6 @@
     if (strncmp(loc_url, "./", 2) == 0)
     {
         /* Skip ./ in front. */
- relative_url=loc_url+2;
     }
     else
     {
@@ -797,7 +796,6 @@
 {
     int status;
     svn_revnum_t wanted;
- struct estat copy;
     char *path;
 
 
@@ -865,9 +863,6 @@
         number_reverted++;
 
 
- /* see below */
- copy=*sts;
-
         DEBUGP("l_st=%s, r_st=%s, old=%p",
                 st__status_string_fr​omint(sts->entry_​status),
                 st__status_string_fr​omint(sts->remote​_status),

Modified: branches/fsvs-1.2.x/​fsvs/src/sync.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/branches/fsvs-1.2.​x/fsvs/src/sync.c?vi​ew=diff&pathrev=​2479&r1=2478​&r2=2479
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/sync.c (original)
+++ branches/fsvs-1.2.x/​fsvs/src/sync.c 2015-12-28 03:48:09-0800
@@ -352,8 +352,6 @@
     int status;
     svn_error_t *status_svn;
     svn_revnum_t rev;
- char *strings;
- int string_space;
 
 
     status=0;
@@ -364,8 +362,6 @@
     /* We cannot easily format the paths for arguments ... first, we don't
      * have any (normally) */
 
- string_space=0;
- strings=NULL;
     while ( ! ( status=url__iterator(&rev) ) )
     {
         if (opt__verbosity() > VERBOSITY_VERYQUIET)

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r2479 - branches/fsvs-1.2.x/fsvs: . src pmarek P.Marek 2015-12-28 03:48:09 PST
Messages per page: