Changeset 10348 for branches/1.9x/libtransmission/ptrarray.c

Timestamp:

Mar 10, 2010, 4:35:11 PM (12 years ago)

Author:

charles

Message:

(1.9x libT) #2958 "Minimize use of tr_ptrArray in critical parts of the code" -- accept patch from sadface to make tr_ptrArrayInsert() a little cleaner

File:

• branches/1.9x/libtransmission/ptrarray.c (modified) (2 diffs)

branches/1.9x/libtransmission/ptrarray.c

@@ -74 +74 @@
                    int           pos )
 {
-    if( pos < 0 || pos > t->n_items )
-        pos = t->n_items;
-
     if( t->n_items >= t->n_alloc )
     {
@@ -83 +80 @@
     }
 
-    memmove( t->items + pos + 1,
-             t->items + pos,
-             sizeof( void* ) * ( t->n_items - pos ) );
+    if( pos < 0 || pos > t->n_items )
+        pos = t->n_items;
+    else
+        memmove( t->items + pos + 1,
+                 t->items + pos,
+                 sizeof( void* ) * ( t->n_items - pos ) );
 
     t->items[pos] = ptr;