Skip to content

Commit

Permalink
Update copyright, remove GPL license text
Browse files Browse the repository at this point in the history
  • Loading branch information
rasa committed Feb 19, 2015
1 parent 5504b03 commit 389dde1
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 43 deletions.
8 changes: 4 additions & 4 deletions nmake.mak
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
all:
$(MAKE)/f time_it.mak CFG="time_it - Win32 Release" all
$(MAKE)/f time_it.mak CFG="time_it - Win32 Debug" all
$(MAKE) /f time_it.mak CFG="time_it - Win32 Release" all
$(MAKE) /f time_it.mak CFG="time_it - Win32 Debug" all

clean:
$(MAKE)/f time_it.mak CFG="time_it - Win32 Release" clean
$(MAKE)/f time_it.mak CFG="time_it - Win32 Debug" clean
$(MAKE) /f time_it.mak CFG="time_it - Win32 Release" clean
$(MAKE) /f time_it.mak CFG="time_it - Win32 Debug" clean

realclean: clean
-cmd /c del /s *.bak
Expand Down
25 changes: 5 additions & 20 deletions time_it.cpp
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
/*
$Id$
Copyright (c) 2005-2006 Ross Smith II (http://smithii.com). All rights reserved.
This program is free software; you can redistribute it and/or modify it
under the terms of version 2 of the GNU General Public License
as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
*/
// Copyright (c) 2005-2015 Ross Smith II. See Mit LICENSE in /LICENSE

#ifdef _MSC_VER
#pragma warning(disable:4996)
Expand Down Expand Up @@ -336,7 +321,7 @@ static void print_stats(int reads_made, ULONGLONG first_tick) {
#ifdef _DEBUG
bucket[j]->debug = 1;
#endif
bucket[j]->bytes += bytes_per_read;
bucket[j]->bytes += bytes_per_read;
continue;
}

Expand All @@ -363,7 +348,7 @@ static void print_stats(int reads_made, ULONGLONG first_tick) {
bucket[j]->bytes += bytes_per_read;
}

/*
/*
buckets[0].ticks = 32 (0->32)
buckets[1].ticks = 16 (0->16)
Expand Down Expand Up @@ -827,7 +812,7 @@ int main(int argc, char * argv[]) {
if (seconds >= 3600) {
bucket[i]->title = " hour";
bucket[i]->title_divisor = 3600;
} else
} else
if (seconds >= 60) {
bucket[i]->title = "minute";
bucket[i]->title_divisor = 60;
Expand Down Expand Up @@ -858,7 +843,7 @@ int main(int argc, char * argv[]) {
read[i]->start_tick = 0;
read[i]->end_tick = 0;
}

for (i = optind; i < argc; ++i) {
time_it(argv[i]);
}
Expand Down
23 changes: 4 additions & 19 deletions version.h
Original file line number Diff line number Diff line change
@@ -1,24 +1,9 @@
/*
$Id$
Copyright (c) 2002-2006 Ross Smith II (http://smithii.com). All rights reserved.
This program is free software; you can redistribute it and/or modify it
under the terms of version 2 of the GNU General Public License
as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
*/
// Copyright (c) 2002-2015 Ross Smith II. See Mit LICENSE in /LICENSE

#define VER_INTERNAL_NAME "time_it"
#define VER_FILE_DESCRIPTION "Time Disk I/O"
#define VER_FILE_DESCRIPTION "Time disk I/O"
#define VER_MAJOR 0
#define VER_MINOR 1
#define VER_STRING2 "0.1"
#define VER_MINOR 2
#define VER_STRING2 "0.2"

#include "ver_defaults.h"

0 comments on commit 389dde1

Please sign in to comment.