songvec: _delete() returns void

The given song must exist, or MPD will abort. Calling it with an unknown song is illegal.

songvec: _delete() returns void
7e7e3eb8 · Max Kellermann · 2e5f8aeb · 7e7e3eb8 · 7e7e3eb8
Commit 7e7e3eb8 authored Jan 24, 2012 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

songvec.c src/songvec.c +3 -3

songvec.h src/songvec.h +1 -1

No files found.
--- a/src/songvec.c
+++ b/src/songvec.c
@@ -142,7 +142,7 @@ songvec_find(const struct songvec *sv, const char *uri)
 	return ret;
 }

-int
+void
 songvec_delete(struct songvec *sv, const struct song *del)
 {
 	size_t i;
@@ -161,11 +161,11 @@ songvec_delete(struct songvec *sv, const struct song *del)
 			sv->base = g_realloc(sv->base, sv_size(sv));
 		}
 		db_unlock();
-		return i;
+		return;
 	}
 	db_unlock();

-	return -1; /* not found */
+	assert(false);
 }

 void

--- a/src/songvec.h
+++ b/src/songvec.h
@@ -36,7 +36,7 @@ void songvec_sort(struct songvec *sv);
 struct song *
 songvec_find(const struct songvec *sv, const char *uri);

-int
+void
 songvec_delete(struct songvec *sv, const struct song *del);

 void