projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
43e4f82
)
fix warning; add length to irlparams so we don't need strlen
author
Wilfried Goesgens
<dothebart@citadel.org>
Sun, 22 Jan 2012 15:34:22 +0000
(16:34 +0100)
committer
Wilfried Goesgens
<dothebart@citadel.org>
Sun, 22 Jan 2012 15:34:22 +0000
(16:34 +0100)
citadel/modules/imap/serv_imap.c
patch
|
blob
|
history
diff --git
a/citadel/modules/imap/serv_imap.c
b/citadel/modules/imap/serv_imap.c
index 5c831deb26cd64e28289bae905fef5f2647bb248..eca14eb05ac6f52b80433d4b1ad3badc0cb69eeb 100644
(file)
--- a/
citadel/modules/imap/serv_imap.c
+++ b/
citadel/modules/imap/serv_imap.c
@@
-152,11
+152,13
@@
struct irl {
};
/* Data which is passed between imap_rename() and imap_rename_backend() */
};
/* Data which is passed between imap_rename() and imap_rename_backend() */
-struct irlparms {
- char *oldname;
- char *newname;
+typedef struct __irlparms {
+ const char *oldname;
+ long oldnamelen;
+ const char *newname;
+ long newnamelen;
struct irl **irl;
struct irl **irl;
-};
+}
irlparms
;
/*
/*
@@
-1344,19
+1346,19
@@
void imap_rename_backend(struct ctdlroom *qrbuf, void *data)
char newroomname[ROOMNAMELEN];
int newfloor = 0;
struct irl *irlp = NULL; /* scratch pointer */
char newroomname[ROOMNAMELEN];
int newfloor = 0;
struct irl *irlp = NULL; /* scratch pointer */
-
struct irlparms *
irlparms;
+
irlparms *my
irlparms;
-
irlparms = (struct
irlparms *) data;
+
myirlparms = (
irlparms *) data;
imap_mailboxname(foldername, sizeof foldername, qrbuf);
/* Rename subfolders */
imap_mailboxname(foldername, sizeof foldername, qrbuf);
/* Rename subfolders */
- if ((!strncasecmp(foldername, irlparms->oldname,
-
strlen(irlparms->oldname)
)
-
&& (foldername[strlen(irlparms->oldname)
] == '/'))) {
+ if ((!strncasecmp(foldername,
my
irlparms->oldname,
+
myirlparms->oldnamelen
)
+
&& (foldername[myirlparms->oldnamelen
] == '/'))) {
sprintf(newfoldername, "%s/%s",
sprintf(newfoldername, "%s/%s",
- irlparms->newname,
- &foldername[
strlen(irlparms->oldname)
+ 1]
+
my
irlparms->newname,
+ &foldername[
myirlparms->oldnamelen
+ 1]
);
newfloor = imap_roomname(newroomname,
);
newfloor = imap_roomname(newroomname,
@@
-1367,8
+1369,8
@@
void imap_rename_backend(struct ctdlroom *qrbuf, void *data)
strcpy(irlp->irl_newroom, newroomname);
strcpy(irlp->irl_oldroom, qrbuf->QRname);
irlp->irl_newfloor = newfloor;
strcpy(irlp->irl_newroom, newroomname);
strcpy(irlp->irl_oldroom, qrbuf->QRname);
irlp->irl_newfloor = newfloor;
- irlp->next = *(irlparms->irl);
- *(irlparms->irl) = irlp;
+ irlp->next = *(
my
irlparms->irl);
+ *(
my
irlparms->irl) = irlp;
}
}
}
}
@@
-1386,7
+1388,7
@@
void imap_rename(int num_parms, ConstStr *Params)
int r;
struct irl *irl = NULL; /* the list */
struct irl *irlp = NULL; /* scratch pointer */
int r;
struct irl *irl = NULL; /* the list */
struct irl *irlp = NULL; /* scratch pointer */
-
struct
irlparms irlparms;
+ irlparms irlparms;
char aidemsg[1024];
if (strchr(Params[3].Key, '\\') != NULL) {
char aidemsg[1024];
if (strchr(Params[3].Key, '\\') != NULL) {
@@
-1436,7
+1438,9
@@
void imap_rename(int num_parms, ConstStr *Params)
/* Otherwise, do the subfolders. Build a list of rooms to rename... */
else {
irlparms.oldname = Params[2].Key;
/* Otherwise, do the subfolders. Build a list of rooms to rename... */
else {
irlparms.oldname = Params[2].Key;
+ irlparms.oldnamelen = Params[2].len;
irlparms.newname = Params[3].Key;
irlparms.newname = Params[3].Key;
+ irlparms.newnamelen = Params[3].len;
irlparms.irl = &irl;
CtdlForEachRoom(imap_rename_backend, (void *) &irlparms);
irlparms.irl = &irl;
CtdlForEachRoom(imap_rename_backend, (void *) &irlparms);