From owner-svn-soc-all@FreeBSD.ORG Wed Jul 17 17:43:32 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 36A8BF54 for ; Wed, 17 Jul 2013 17:43:32 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) by mx1.freebsd.org (Postfix) with ESMTP id 0E94AFB6 for ; Wed, 17 Jul 2013 17:43:32 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6HHhVNC071513 for ; Wed, 17 Jul 2013 17:43:31 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r6HHhV3U071510 for svn-soc-all@FreeBSD.org; Wed, 17 Jul 2013 17:43:31 GMT (envelope-from dpl@FreeBSD.org) Date: Wed, 17 Jul 2013 17:43:31 GMT Message-Id: <201307171743.r6HHhV3U071510@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r254892 - soc2013/dpl/head/contrib/xz/src/xz MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jul 2013 17:43:32 -0000 Author: dpl Date: Wed Jul 17 17:43:31 2013 New Revision: 254892 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254892 Log: Just commiting to have the latest version, so I can comment about the code with my mentor. Modified: soc2013/dpl/head/contrib/xz/src/xz/file_io.c soc2013/dpl/head/contrib/xz/src/xz/main.c Modified: soc2013/dpl/head/contrib/xz/src/xz/file_io.c ============================================================================== --- soc2013/dpl/head/contrib/xz/src/xz/file_io.c Wed Jul 17 17:36:07 2013 (r254891) +++ soc2013/dpl/head/contrib/xz/src/xz/file_io.c Wed Jul 17 17:43:31 2013 (r254892) @@ -980,7 +980,7 @@ io_open_files(char *filename[], int files) { int i; - file_pair **pairs = (file_pair **)malloc(files * sizeof(file_pair *)); + file_pair **pairs = (file_pair **)malloc(sizeof(file_pair **)); if( opt_mode == MODE_LIST) if (opt_format != FORMAT_XZ && opt_format != FORMAT_AUTO) @@ -1007,6 +1007,7 @@ opt_force = true; } + pairs[i] = (file_pair*)malloc(sizeof(file_pair *)); pairs[i] = io_open_src(filename[i]); if( opt_mode != MODE_TEST ) io_open_dest(pairs[i]); Modified: soc2013/dpl/head/contrib/xz/src/xz/main.c ============================================================================== --- soc2013/dpl/head/contrib/xz/src/xz/main.c Wed Jul 17 17:36:07 2013 (r254891) +++ soc2013/dpl/head/contrib/xz/src/xz/main.c Wed Jul 17 17:43:31 2013 (r254892) @@ -255,24 +255,22 @@ // check it as loop termination condition. while (true) { char *name = read_name(&args); - printf("name: %s\n", name); if (name == NULL) break; // read_name() doesn't return empty names. assert(name[0] != '\0'); - args.arg_count++; args.arg_names[nfiles] = name; + printf("args.args_names[%d]: %s\n", nfiles, args.arg_names[nfiles]); nfiles++; + args.arg_count++; } - if (args.files_name != stdin_filename) (void)fclose(args.files_file); } - printf("nfiles: %d\n", nfiles); - for ( i = 0; (size_t)i < args.arg_count; i++) - printf("file: %s\n", args.arg_names[i]); + for ( i = 0; i < nfiles; i++) + printf("file[%d]: %s\n", i, args.arg_names[i]); file_pair **pairs = io_open_files(args.arg_names, nfiles);