← Back to branch summary

~ubuntu-branches/ubuntu/saucy/navit/saucy-proposed

« back to all changes in this revision

Viewing changes to navit/map/csv/csv.c

  • Committer: Package Import Robot
  • Author(s): Gilles Filippini
  • Date: 2012-01-30 21:46:45 UTC
  • mfrom: (1.1.14)
  • Revision ID: package-import@ubuntu.com-20120130214645-mjvkslctpagferf3
Tags: 0.5.0~svn4909+dfsg.1-1
* New upstream snapshot:
  + GUI Internal:
    . Former destinations list
    . Support for saving GUI settings
    . Made search result lists pageable when onscreen keyboard is hidden
  + GUI GTK:
    . Menu accelerators
  + New profile to calculate shortest car route
* Drop patches:
  + manpage-minus-signs.patch: applied upstream
  + search_trick: not needed anymore (search result lists now pageable)
* Update patch fix-cmake.patch: partially applied upstream
* Refresh patches:
  + icons-dir
  + qt-cmake.patch
* debian/README.source: acknowledge removal of navit/binding/win32 from
  upstream tarball

* debian/rules: s/GNU_TYPE/MULTIARCH/g

Show diffs side-by-side

added added

removed removed

Lines of Context:
navit/map/csv/csv.c
17
17
 * Boston, MA  02110-1301, USA.
18
18
 */
19
19
 
 
20
 
 
21
#include "config.h"
 
22
 
20
23
#include <stdlib.h>
21
24
#include <glib.h>
22
25
#include <stdio.h>
23
26
#include <string.h>
 
27
#include <math.h>
24
28
#ifdef HAVE_UNISTD_H
25
29
#include <unistd.h>
26
30
#endif
27
 
#include <math.h>
28
 
#include "config.h"
29
31
#include "debug.h"
30
32
#include "plugin.h"
31
33
#include "projection.h"
614
616
        if(data) {
615
617
          struct file_wordexp *wexp;
616
618
          char **wexp_data;
 
619
          FILE *fp;
617
620
          wexp=file_wordexp_new(data->u.str);
618
621
          wexp_data=file_wordexp_get_array(wexp);
619
622
          dbg(1,"map_new_csv %s\n", data->u.str);       
622
625
 
623
626
          //load csv file into quadtree structure
624
627
          //if column number is wrong skip
625
 
          FILE*fp;
626
628
          if((fp=fopen(m->filename,"rt"))) {
627
629
                const int max_line_len = 256;
628
630
                char *line=g_alloca(sizeof(char)*max_line_len);