| props.c (302408) | props.c (362181) |
|---|---|
| 1/* 2 * props.c : routines dealing with properties in the working copy 3 * 4 * ==================================================================== 5 * Licensed to the Apache Software Foundation (ASF) under one 6 * or more contributor license agreements. See the NOTICE file 7 * distributed with this work for additional information 8 * regarding copyright ownership. The ASF licenses this file --- 2156 unchanged lines hidden (view full) --- 2165 svn_wc_canonicalize_svn_prop_get_file_t getter, 2166 void *getter_baton, 2167 apr_pool_t *pool) 2168{ 2169 svn_stringbuf_t *new_value = NULL; 2170 2171 /* Keep this static, it may get stored (for read-only purposes) in a 2172 hash that outlives this function. */ | 1/* 2 * props.c : routines dealing with properties in the working copy 3 * 4 * ==================================================================== 5 * Licensed to the Apache Software Foundation (ASF) under one 6 * or more contributor license agreements. See the NOTICE file 7 * distributed with this work for additional information 8 * regarding copyright ownership. The ASF licenses this file --- 2156 unchanged lines hidden (view full) --- 2165 svn_wc_canonicalize_svn_prop_get_file_t getter, 2166 void *getter_baton, 2167 apr_pool_t *pool) 2168{ 2169 svn_stringbuf_t *new_value = NULL; 2170 2171 /* Keep this static, it may get stored (for read-only purposes) in a 2172 hash that outlives this function. */ |
| 2173 static const svn_string_t boolean_value = 2174 { 2175 SVN_PROP_BOOLEAN_TRUE, 2176 sizeof(SVN_PROP_BOOLEAN_TRUE) - 1 2177 }; | 2173 static const svn_string_t boolean_value 2174 = SVN__STATIC_STRING(SVN_PROP_BOOLEAN_TRUE); |
| 2178 2179 SVN_ERR(validate_prop_against_node_kind(propname, path, kind, pool)); 2180 2181 /* This code may place the new prop val in either NEW_VALUE or PROPVAL. */ 2182 if (!skip_some_checks && (strcmp(propname, SVN_PROP_EOL_STYLE) == 0)) 2183 { 2184 svn_subst_eol_style_t eol_style; 2185 const char *ignored_eol; --- 48 unchanged lines hidden (view full) --- 2234 /*scratch_*/pool, 2235 /*scratch_*/pool)); 2236 if (duplicate_targets && duplicate_targets->nelts > 0) 2237 { 2238 const char *more_str = ""; 2239 if (duplicate_targets->nelts > 1) 2240 { 2241 more_str = apr_psprintf(/*scratch_*/pool, | 2175 2176 SVN_ERR(validate_prop_against_node_kind(propname, path, kind, pool)); 2177 2178 /* This code may place the new prop val in either NEW_VALUE or PROPVAL. */ 2179 if (!skip_some_checks && (strcmp(propname, SVN_PROP_EOL_STYLE) == 0)) 2180 { 2181 svn_subst_eol_style_t eol_style; 2182 const char *ignored_eol; --- 48 unchanged lines hidden (view full) --- 2231 /*scratch_*/pool, 2232 /*scratch_*/pool)); 2233 if (duplicate_targets && duplicate_targets->nelts > 0) 2234 { 2235 const char *more_str = ""; 2236 if (duplicate_targets->nelts > 1) 2237 { 2238 more_str = apr_psprintf(/*scratch_*/pool, |
| 2242 _(" (%d more duplicate targets found)"), | 2239 Q_(" (%d more duplicate target found)", 2240 " (%d more duplicate targets found)", 2241 duplicate_targets->nelts - 1), |
| 2243 duplicate_targets->nelts - 1); 2244 } 2245 return svn_error_createf( 2246 SVN_ERR_WC_DUPLICATE_EXTERNALS_TARGET, NULL, 2247 _("Invalid %s property on '%s': " 2248 "target '%s' appears more than once%s"), 2249 SVN_PROP_EXTERNALS, 2250 svn_dirent_local_style(path, pool), --- 201 unchanged lines hidden --- | 2242 duplicate_targets->nelts - 1); 2243 } 2244 return svn_error_createf( 2245 SVN_ERR_WC_DUPLICATE_EXTERNALS_TARGET, NULL, 2246 _("Invalid %s property on '%s': " 2247 "target '%s' appears more than once%s"), 2248 SVN_PROP_EXTERNALS, 2249 svn_dirent_local_style(path, pool), --- 201 unchanged lines hidden --- |