← Back to branch summary

~svn/ubuntu/oneiric/subversion/ppa

« back to all changes in this revision

Viewing changes to subversion/libsvn_diff/diff_file.c

  • Committer: Max Bowsher
  • Date: 2012-10-25 00:08:47 UTC
  • mfrom: (44.1.49 precise)
  • Revision ID: _@maxb.eu-20121025000847-8xxg7ea4qdqio0w4
Tags: 1.7.7-0svn2~oneiric+svn1
Merge 1.7.7

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/libsvn_diff/diff_file.c
1168
1168
                            apr_pool_t *pool)
1169
1169
{
1170
1170
  apr_getopt_t *os;
1171
 
  struct opt_parsing_error_baton_t opt_parsing_error_baton = { NULL, pool };
 
1171
  struct opt_parsing_error_baton_t opt_parsing_error_baton;
1172
1172
  /* Make room for each option (starting at index 1) plus trailing NULL. */
1173
1173
  const char **argv = apr_palloc(pool, sizeof(char*) * (args->nelts + 2));
1174
1174
 
 
1175
  opt_parsing_error_baton.err = NULL;
 
1176
  opt_parsing_error_baton.pool = pool;
 
1177
 
1175
1178
  argv[0] = "";
1176
1179
  memcpy((void *) (argv + 1), args->elts, sizeof(char*) * args->nelts);
1177
1180
  argv[args->nelts + 1] = NULL;