X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fdata%2Fpsql-reader.c;h=76b4674dc9d914cabaadce71aef6512be050e683;hb=6549c9aced0949b16abb372257772fc0893e02bb;hp=68ea7e5672cea1c483fb356e75b5834852642c1d;hpb=aaa1996142d111e34e13e490fb299bb94a73ed2f;p=pspp diff --git a/src/data/psql-reader.c b/src/data/psql-reader.c index 68ea7e5672..76b4674dc9 100644 --- a/src/data/psql-reader.c +++ b/src/data/psql-reader.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -286,8 +286,7 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) } } - r->postgres_epoch = - calendar_gregorian_to_offset (2000, 1, 1, NULL, NULL); + r->postgres_epoch = calendar_gregorian_to_offset (2000, 1, 1, NULL); /* Create the dictionary and populate it */ @@ -838,7 +837,7 @@ set_value (struct psql_reader *r) case VARCHAROID: case BPCHAROID: case BYTEAOID: - memcpy (value_str_rw (val, var_width), (char *) vptr, + memcpy (value_str_rw (val, var_width), vptr, MIN (length, var_width)); break;