X-Git-Url: https://ruderich.org/simon/gitweb/?p=coloredstderr%2Fcoloredstderr.git;a=blobdiff_plain;f=src%2Ftrackfds.h;h=c749f5e1d6f6cf142e5ce455888fb6d75c7eea58;hp=28b38fbf978b05d439434ddbf2502482525b3ba1;hb=8a65b4486febf00e3fad5bafc3773a811e675a4c;hpb=b950cdb79209e092d20d629bd1b0e9211647bd1e

diff --git a/src/trackfds.h b/src/trackfds.h
index 28b38fb..c749f5e 100644
--- a/src/trackfds.h
+++ b/src/trackfds.h
@@ -1,7 +1,7 @@
 /*
  * Utility functions to track file descriptors.
  *
- * Copyright (C) 2013  Simon Ruderich
+ * Copyright (C) 2013-2015  Simon Ruderich
  *
  * 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
@@ -99,12 +99,14 @@ static int init_tracked_fds_list(size_t count) {
     return 1;
 }
 
-/* Load tracked file descriptors from the environment. The environment is used
+/*
+ * Load tracked file descriptors from the environment. The environment is used
  * to pass the information to child processes.
  *
  * ENV_NAME_FDS and ENV_NAME_PRIVATE_FDS have the following format: Each
  * descriptor as string followed by a comma; there's a trailing comma.
- * Example: "2,4,". */
+ * Example: "2,4,".
+ */
 static void init_from_environment(void) {
 #ifdef DEBUG
     debug("init_from_environment()\t\t[%d]\n", getpid());
@@ -185,10 +187,6 @@ static void init_from_environment(void) {
             goto next;
         }
 
-        if (i == count) {
-            break;
-        }
-
         /* Replace ',' to null-terminate number for atoi(). */
         *x = 0;
 
@@ -406,7 +404,7 @@ inline static int tracked_fds_find(int fd) {
         return 0;
     }
 
-    if (fd < TRACKFDS_STATIC_COUNT) {
+    if (likely(fd < TRACKFDS_STATIC_COUNT)) {
         return tracked_fds[fd];
     }