The R Project SVN R

Rev

Rev 83169 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 83169 Rev 83234
Line 514... Line 514...
514
		    /* We have to convert the minutes into decimal.  */
514
		    /* We have to convert the minutes into decimal.  */
515
		    if (val % 100 >= 60) return NULL;
515
		    if (val % 100 >= 60) return NULL;
516
		    val = (val / 100) * 100 + ((val % 100) * 50) / 30;
516
		    val = (val / 100) * 100 + ((val % 100) * 50) / 30;
517
		}
517
		}
518
		/* https://en.wikipedia.org/wiki/List_of_UTC_time_offsets */
518
		/* https://en.wikipedia.org/wiki/List_of_UTC_time_offsets */
519
		if (val > 1400) return NULL;
519
		if (val > 1400) {
-
 
520
		    warning("values for %%z outside +/-1400 are an error");
-
 
521
		    return NULL;
-
 
522
		}
520
		off = ((val * 3600) / 100);
523
		off = ((val * 3600) / 100);
521
		if (neg) off = -off;
524
		if (neg) off = -off;
522
		*poffset = off;
525
		*poffset = off;
523
	    }
526
	    }
524
	    break;
527
	    break;
Line 996... Line 999...
996
		else {
999
		else {
997
		    /* We have to convert the minutes into decimal.  */
1000
		    /* We have to convert the minutes into decimal.  */
998
		    if (val % 100 >= 60) return NULL;
1001
		    if (val % 100 >= 60) return NULL;
999
		    val = (val / 100) * 100 + ((val % 100) * 50) / 30;
1002
		    val = (val / 100) * 100 + ((val % 100) * 50) / 30;
1000
		}
1003
		}
-
 
1004
		if (val > 1400) {
-
 
1005
		    warning("values for %%z outside +/-1400 are an error");
1001
		if (val > 1200) return NULL;
1006
		    return NULL;
-
 
1007
		}
1002
		off = (val * 3600) / 100;
1008
		off = (val * 3600) / 100;
1003
		if (neg) off = -off;
1009
		if (neg) off = -off;
1004
		*poffset = off;
1010
		*poffset = off;
1005
	    }
1011
	    }
1006
	    break;
1012
	    break;