Merge pull request #164 from cs50/develop

A few clarifications, fixes

Author: Kareem Zidane

Diff for: Makefile

@@ -1,4 +1,4 @@
-VERSION := 9.0.0
+VERSION := 9.0.1
 MAJOR_VERSION := $(shell echo $(VERSION) | head -c 1)
 
 # installation directory (/usr/local by default)
@@ -128,6 +128,6 @@ version:
 .PHONY: uninstall
 uninstall:
 	rm -f $(DESTDIR)/include/cs50.h
-	rm -rf $(DESTDIR)/src/libcs50
+	rm -rf $(DESTDIR)/src/cs50.c
 	rm -f $(addprefix $(DESTDIR)/lib/, $(LIB_BASE) $(LIB_MAJOR) $(LIB_VERSION))
 	rm -f $(addprefix $(DESTDIR)/$(MANDIR)/, eprintf.3 get_*.3)

Diff for: src/cs50.c

@@ -78,7 +78,7 @@ static string *strings = NULL;
 string get_string(va_list *args, const string format, ...)
 {
     // Check whether we have room for another string
-    if (allocations * sizeof (string) == SIZE_MAX)
+    if (allocations == SIZE_MAX / sizeof (string))
     {
         return NULL;
     }
@@ -374,7 +374,7 @@ long get_long(const string format, ...)
     // Try to get a long from user
     while (true)
     {
-        // Get line of text, returning LLONG_MAX on failure
+        // Get line of text, returning LONG_MAX on failure
         string line = get_string(&ap, format);
         if (line == NULL)
         {

Diff for: src/cs50.h

@@ -36,8 +36,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _CS50_H
-#define _CS50_H
+#ifndef CS50_H
+#define CS50_H
 
 #include <float.h>
 #include <limits.h>
@@ -51,7 +51,7 @@
 typedef unsigned char byte;
 
 /**
- * Our own type for strings.
+ * Our own type for (pointers to) strings.
  */
 typedef char *string;