Taylor Blau <me@xxxxxxxxxxxx> writes: > +/* > + * offset_to_pack_pos converts an object offset to a pack position. This > + * function returns zero on success, and a negative number otherwise. The > + * parameter 'pos' is usable only on success. > + * > + * If the reverse index has not yet been loaded, this function loads it lazily, > + * and returns an negative number if an error was encountered. It is somewhat strange to see a function that yields a non-negative "position" on success and a negative value to signal a failure to have a separate pointer to the location to receive the true return value. Do we truly care the upper half of "uint32_t" (in other words, do we seriously want to support more than 2G positions in a pack)? What I'm trying to get at is that int pos = offset_to_pack_pos(...); if (pos < 0) error(); else use(pos); is more natural than uint32_t pos; if (offset_to_pack_pos(..., &pos) < 0) error(); else use(pos); but now I wrote it down and laid it out in front of my eyes, the latter does not look too bad. ... later comes back after reading through the series ... The new callers all looked quite nice to eyes. Because we discourage assignment inside if() condition, the converted result does not make the code more verbose than the original. In fact, it makes it even clearer that we are checking for an error return from a function call. Quite nice. > + * This function runs in time O(log N) with the number of objects in the pack. Is it a good idea to commit to such performance characteristics as a promise to callers like this (the comment applies to all three functions)? It depends on how a developer is helped by this comment when deciding whether to use this function, or find other ways, to implement what s/he wants to do. > + */ > +int offset_to_pack_pos(struct packed_git *p, off_t ofs, uint32_t *pos); > +/* > + * pack_pos_to_index converts the given pack-relative position 'pos' by > + * returning an index-relative position. > + * > + * If the reverse index has not yet been loaded, or the position is out of > + * bounds, this function aborts. > + * > + * This function runs in constant time. > + */ > +uint32_t pack_pos_to_index(struct packed_git *p, uint32_t pos); > + > +/* > + * pack_pos_to_offset converts the given pack-relative position 'pos' into a > + * pack offset. For a pack with 'N' objects, asking for position 'N' will return > + * the total size (in bytes) of the pack. If we talk about "asking for 'N'" and want it to mean "one beyond the last position", it is better to clarify that we count from 0. But see below. > + * If the reverse index has not yet been loaded, or the position is out of > + * bounds, this function aborts. I think it is easier to read if the "unlike the above function, this allows pos that is one beyond the last object" is explained next to "if out of bounds, it is an error", not as a part of the previous paragraph. > + * This function runs in constant time. > + */ > +off_t pack_pos_to_offset(struct packed_git *p, uint32_t pos); > + > #endif