rewrite marinerlogfetching

marinerlogfetching and marinerlog have a lot of code duplication.
fix that.

Change-Id: I52624ab8d1a6310c92a580990c45cc9313ea7a1c
Reviewed-on: http://gerrit.openafs.org/1503
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afs/afs_mariner.c b/src/afs/afs_mariner.c
index d61ff7d..e1ae262 100644 (file)
--- a/src/afs/afs_mariner.c
+++ b/src/afs/afs_mariner.c
@@ -71,35 +71,7 @@ void
 afs_MarinerLogFetch(register struct vcache *avc, register afs_int32 off,
                    register afs_int32 bytes, register afs_int32 idx)
 {
-    struct sockaddr_in taddr;
-    register char *tp, *tp1, *tp2;
-    struct iovec dvec;
-    int len;
-
-
-    AFS_STATCNT(afs_MarinerLog);
-    taddr.sin_family = AF_INET;
-    taddr.sin_addr.s_addr = afs_marinerHost;
-    taddr.sin_port = htons(2106);
-#ifdef  STRUCT_SOCKADDR_HAS_SA_LEN
-    taddr.sin_len = sizeof(taddr);
-#endif
-    tp = tp1 = (char *)osi_AllocSmallSpace(AFS_SMALLOCSIZ);
-    strcpy(tp, "fetch$Fetching ");
-    tp += 15;                  /* change it if string changes */
-    tp2 = afs_GetMariner(avc);
-    strcpy(tp, tp2);
-    tp += strlen(tp2);
-    *tp++ = '\n';
-    /* note, console doesn't want a terminating null */
-    len = strlen(tp1) - 1;
-    /* I don't care if mariner packets fail to be sent */
-    dvec.iov_base = tp1;
-    dvec.iov_len = len;
-    AFS_GUNLOCK();
-    (void)osi_NetSend(afs_server->socket, &taddr, &dvec, 1, len, 0);
-    AFS_GLOCK();
-    osi_FreeSmallSpace(tp1);
+    return afs_MarinerLog("fetch$Fetching", avc);
 }                              /*afs_MarinerLogFetch */
 
 void