Login | Register
My pages Projects Community openCollabNet

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

fsvs
Discussion topic

Back to topic list

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

Author pmarek
Full name P.Marek
Date 2015-02-12 03:04:14 PST
Message Author: pmarek
Date: 2015-02-12 03:04:13-0800
New Revision: 2472

Modified:
   branches/fsvs-1.2.x/​fsvs/CHANGES
   branches/fsvs-1.2.x/​fsvs/src/cache.c
   branches/fsvs-1.2.x/​fsvs/src/cache.h
   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/helper.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/waa.c

Log:
Updates for GCC 5, see Debian Bug#777857.

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​2&r1=2471&r2​=2472
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/CHANGES (original)
+++ branches/fsvs-1.2.x/​fsvs/CHANGES 2015-02-12 03:04:13-0800
@@ -1,3 +1,6 @@
+Changes since 1.2.6
+- Updates for GCC 5
+
 Changes since 1.2.5
 - Fix for segfault on deleted properties, eg. "svn:owner".
 - configure.in fix for OS X Lion with clang; thanks, Ryan!

Modified: branches/fsvs-1.2.x/​fsvs/src/cache.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/branches/fsvs-1.2.​x/fsvs/src/cache.c?v​iew=diff&pathrev​=2472&r1=2471​&r2=2472
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/cache.c (original)
+++ branches/fsvs-1.2.x/​fsvs/src/cache.c 2015-02-12 03:04:13-0800
@@ -46,7 +46,7 @@
  *
  * Please note that memory may have to be reallocated, causing \c *cache to
  * change! */
-inline int cch__entry_set(struct cache_entry_t **cache,
+int cch__entry_set(struct cache_entry_t **cache,
         cache_value_t id, const char *data, int len,
         int copy_old_data,
         char **copy)

Modified: branches/fsvs-1.2.x/​fsvs/src/cache.h
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/branches/fsvs-1.2.​x/fsvs/src/cache.h?v​iew=diff&pathrev​=2472&r1=2471​&r2=2472
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/cache.h (original)
+++ branches/fsvs-1.2.x/​fsvs/src/cache.h 2015-02-12 03:04:13-0800
@@ -94,7 +94,7 @@
         int *index, char **data, int *len);
 
 /** Copy the given data into the given cache entry. */
-inline int cch__entry_set(struct cache_entry_t **cache,
+int cch__entry_set(struct cache_entry_t **cache,
         cache_value_t id, const char *data, int len,
         int copy_old_data,
         char **copy);

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=​2472&r1=2471​&r2=2472
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/diff.c (original)
+++ branches/fsvs-1.2.x/​fsvs/src/diff.c 2015-02-12 03:04:13-0800
@@ -721,7 +721,7 @@
     int status;
     struct estat **sts;
     int removed;
- char *fn, *special_stg;
+ char *fn;
     apr_pool_t *subpool;
 
 
@@ -774,8 +774,6 @@
             else if (entry->entry_status || entry->remote_status)
             {
                 /* Local changes, or changes to repository. */
- special_stg=NULL;
-
                 if (S_ISDIR(entry->st.mode))
                 {
                     /* TODO: meta-data diff? */

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=2472&r1=2471​&r2=2472
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/est_ops.c (original)
+++ branches/fsvs-1.2.x/​fsvs/src/est_ops.c 2015-02-12 03:04:13-0800
@@ -499,7 +499,7 @@
         [sizeof(buffer)-1]=0xff,
         [sizeof(buffer)-2]=0x0,
     };
- int is_dir, is_dev, status, is_spec;
+ int is_dir, is_dev, status;
     int intnum;
 
 
@@ -518,8 +518,6 @@
 
     is_dir = S_ISDIR(sts->st.mode);
     is_dev = S_ISBLK(sts->st.mode) || S_ISCHR(sts->st.mode);
- is_spec = S_ISBLK(sts->st.mode) || S_ISCHR(sts->st.mode) ||
- S_ISLNK(sts->st.mode);
 
 
     if (sts->match_pattern)

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=2472&r1=2471​&r2=2472
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/helper.c (original)
+++ branches/fsvs-1.2.x/​fsvs/src/helper.c 2015-02-12 03:04:13-0800
@@ -84,7 +84,7 @@
  * \note If there's an irreparable conversion error, we must not print
  * (parts of) the strings. One or even both might not be suitable for
  * printing on the current console - so we do not know what could happen. */
-inline int hlp___do_convert(iconv_t cd,
+static inline int hlp___do_convert(iconv_t cd,
         const char* from, char** to,
         int len)
 {

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​=2472&r1=2471​&r2=2472
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/props.h (original)
+++ branches/fsvs-1.2.x/​fsvs/src/props.h 2015-02-12 03:04:13-0800
@@ -36,7 +36,7 @@
 /** Set a property by name and data/datalen. */
 int prp__set(hash_t db, const char *name, const char *data, int datalen);
 /** Set a property by svn_string_t. */
-inline int prp__set_svnstr(hash_t db,
+int prp__set_svnstr(hash_t db,
         const char *name,
         const svn_string_t *utf8_value);
 

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=2472&r1=24​71&r2=2472
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/racallback.​c (original)
+++ branches/fsvs-1.2.x/​fsvs/src/racallback.​c 2015-02-12 03:04:13-0800
@@ -42,6 +42,7 @@
     char *cfg_usr_path;
 
 
+ cfg_usr_path = NULL;
     STOPIF( hlp__get_svn_config(​&cfg_hash), NULL);
 
     cfg = apr_hash_get(cfg_hash, SVN_CONFIG_CATEGORY_CONFIG,

Modified: branches/fsvs-1.2.x/​fsvs/src/waa.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/branches/fsvs-1.2.​x/fsvs/src/waa.c?vie​w=diff&pathrev=2​472&r1=2471&​r2=2472
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/waa.c (original)
+++ branches/fsvs-1.2.x/​fsvs/src/waa.c 2015-02-12 03:04:13-0800
@@ -121,7 +121,7 @@
 
 
 /** Convenience function for creating two paths. */
-inline void waa___init_path(enum opt__settings_e which,
+static inline void waa___init_path(enum opt__settings_e which,
         char *dest, char **eos)
 {
     int l;
@@ -1824,7 +1824,7 @@
  * - it was freshly added.
  *
  * */
-inline int waa___check_dir_for_​update(struct estat *sts)
+static inline int waa___check_dir_for_​update(struct estat *sts)
 {
     int status;
 
@@ -2738,7 +2738,7 @@
 
 
 /** Abbreviation function for tree recursion. */
-inline int waa___recurse_tree(struct estat **list, action_t handler,
+static inline int waa___recurse_tree(struct estat **list, action_t handler,
         int (*me)(struct estat *, action_t ))
 {
     struct estat *sts;

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

Messages

Show all messages in topic

svn commit: r2472 - branches/fsvs-1.2.x/fsvs: . src pmarek P.Marek 2015-02-12 03:04:14 PST
Messages per page: