Mon Apr 7 18:40:05 2014 UTC ()
Non-void function must return a value


(adam)
diff -r1.4 -r1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_iso9660.c

cvs diff -r1.4 -r1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_iso9660.c (expand / switch to unified diff)

--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_iso9660.c 2014/04/03 13:05:14 1.4
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_iso9660.c 2014/04/07 18:40:05 1.5
@@ -2667,27 +2667,27 @@ heap_add_entry(struct archive_read *a, s @@ -2667,27 +2667,27 @@ heap_add_entry(struct archive_read *a, s
2667 } 2667 }
2668 2668
2669 file_key = file->key = key; 2669 file_key = file->key = key;
2670 2670
2671 /* 2671 /*
2672 * Start with hole at end, walk it up tree to find insertion point. 2672 * Start with hole at end, walk it up tree to find insertion point.
2673 */ 2673 */
2674 hole = heap->used++; 2674 hole = heap->used++;
2675 while (hole > 0) { 2675 while (hole > 0) {
2676 parent = (hole - 1)/2; 2676 parent = (hole - 1)/2;
2677 parent_key = heap->files[parent]->key; 2677 parent_key = heap->files[parent]->key;
2678 if (file_key >= parent_key) { 2678 if (file_key >= parent_key) {
2679 heap->files[hole] = file; 2679 heap->files[hole] = file;
2680 return; 2680 return (ARCHIVE_OK);
2681 } 2681 }
2682 // Move parent into hole <==> move hole up tree. 2682 // Move parent into hole <==> move hole up tree.
2683 heap->files[hole] = heap->files[parent]; 2683 heap->files[hole] = heap->files[parent];
2684 hole = parent; 2684 hole = parent;
2685 } 2685 }
2686 heap->files[0] = file; 2686 heap->files[0] = file;
2687 2687
2688 return (ARCHIVE_OK); 2688 return (ARCHIVE_OK);
2689} 2689}
2690 2690
2691static struct file_info * 2691static struct file_info *
2692heap_get_entry(struct heap_queue *heap) 2692heap_get_entry(struct heap_queue *heap)
2693{ 2693{