- Timestamp:
- Aug 15, 2009, 7:16:47 PM (16 years ago)
- Branches:
- master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
- Children:
- 4db2355
- Parents:
- 96cdeaf (diff), 369a7f0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
zwrite.c
r96cdeaf r01ff87d 5 5 #include "owl.h" 6 6 7 int owl_zwrite_create_from_line(owl_zwrite *z, c har *line)7 int owl_zwrite_create_from_line(owl_zwrite *z, const char *line) 8 8 { 9 9 int argc, badargs, myargc, i, len; 10 char **argv, **myargv; 10 char **argv; 11 const char *const *myargv; 11 12 char *msg = NULL; 12 13 … … 25 26 26 27 /* parse the command line for options */ 27 argv=myargv=owl_parseline(line, &argc); 28 argv=owl_parseline(line, &argc); 29 myargv=strs(argv); 28 30 if (argc<0) { 29 31 owl_function_error("Unbalanced quotes in zwrite"); … … 150 152 void owl_zwrite_populate_zsig(owl_zwrite *z) 151 153 { 152 char *zsigproc, *zsigowlvar, *zsigzvar, *ptr; 154 const char *zsigproc, *zsigowlvar, *zsigzvar; 155 char *ptr; 153 156 struct passwd *pw; 154 157 … … 200 203 } 201 204 202 void owl_zwrite_send_ping( owl_zwrite *z)205 void owl_zwrite_send_ping(const owl_zwrite *z) 203 206 { 204 207 int i, j; … … 216 219 for (i=0; i<j; i++) { 217 220 if (strcmp(z->realm, "")) { 218 to = owl_sprintf("%s@%s", (c har *) owl_list_get_element(&(z->recips), i), z->realm);221 to = owl_sprintf("%s@%s", (const char *) owl_list_get_element(&(z->recips), i), z->realm); 219 222 } else { 220 223 to = owl_strdup(owl_list_get_element(&(z->recips), i)); … … 226 229 } 227 230 228 void owl_zwrite_set_message(owl_zwrite *z, c har *msg)231 void owl_zwrite_set_message(owl_zwrite *z, const char *msg) 229 232 { 230 233 int i, j; … … 240 243 tmp = toline; 241 244 if (strcmp(z->realm, "")) { 242 toline = owl_sprintf( "%s%s@%s ", toline, (c har *) owl_list_get_element(&(z->recips), i), z->realm);245 toline = owl_sprintf( "%s%s@%s ", toline, (const char *) owl_list_get_element(&(z->recips), i), z->realm); 243 246 } else { 244 toline = owl_sprintf( "%s%s ", toline, (c har *) owl_list_get_element(&(z->recips), i));247 toline = owl_sprintf( "%s%s ", toline, (const char *) owl_list_get_element(&(z->recips), i)); 245 248 } 246 249 owl_free(tmp); … … 260 263 } 261 264 262 c har *owl_zwrite_get_message(owl_zwrite *z)265 const char *owl_zwrite_get_message(const owl_zwrite *z) 263 266 { 264 267 if (z->message) return(z->message); … … 266 269 } 267 270 268 int owl_zwrite_is_message_set( owl_zwrite *z)271 int owl_zwrite_is_message_set(const owl_zwrite *z) 269 272 { 270 273 if (z->message) return(1); … … 272 275 } 273 276 274 int owl_zwrite_send_message( owl_zwrite *z)277 int owl_zwrite_send_message(const owl_zwrite *z) 275 278 { 276 279 int i, j; … … 283 286 for (i=0; i<j; i++) { 284 287 if (strcmp(z->realm, "")) { 285 to = owl_sprintf("%s@%s", (c har *) owl_list_get_element(&(z->recips), i), z->realm);288 to = owl_sprintf("%s@%s", (const char *) owl_list_get_element(&(z->recips), i), z->realm); 286 289 } else { 287 290 to = owl_strdup( owl_list_get_element(&(z->recips), i)); … … 299 302 } 300 303 301 int owl_zwrite_create_and_send_from_line(c har *cmd,char *msg)304 int owl_zwrite_create_and_send_from_line(const char *cmd, const char *msg) 302 305 { 303 306 owl_zwrite z; … … 314 317 } 315 318 316 c har *owl_zwrite_get_class(owl_zwrite *z)319 const char *owl_zwrite_get_class(const owl_zwrite *z) 317 320 { 318 321 return(z->class); 319 322 } 320 323 321 c har *owl_zwrite_get_instance(owl_zwrite *z)324 const char *owl_zwrite_get_instance(const owl_zwrite *z) 322 325 { 323 326 return(z->inst); 324 327 } 325 328 326 c har *owl_zwrite_get_opcode(owl_zwrite *z)329 const char *owl_zwrite_get_opcode(const owl_zwrite *z) 327 330 { 328 331 return(z->opcode); 329 332 } 330 333 331 void owl_zwrite_set_opcode(owl_zwrite *z, c har *opcode)334 void owl_zwrite_set_opcode(owl_zwrite *z, const char *opcode) 332 335 { 333 336 if (z->opcode) owl_free(z->opcode); … … 335 338 } 336 339 337 c har *owl_zwrite_get_realm(owl_zwrite *z)340 const char *owl_zwrite_get_realm(const owl_zwrite *z) 338 341 { 339 342 return(z->realm); 340 343 } 341 344 342 c har *owl_zwrite_get_zsig(owl_zwrite *z)345 const char *owl_zwrite_get_zsig(const owl_zwrite *z) 343 346 { 344 347 if (z->zsig) return(z->zsig); … … 346 349 } 347 350 348 void owl_zwrite_get_recipstr( owl_zwrite *z, char *buff)351 void owl_zwrite_get_recipstr(const owl_zwrite *z, char *buff) 349 352 { 350 353 int i, j; … … 359 362 } 360 363 361 int owl_zwrite_get_numrecips( owl_zwrite *z)364 int owl_zwrite_get_numrecips(const owl_zwrite *z) 362 365 { 363 366 return(owl_list_get_size(&(z->recips))); 364 367 } 365 368 366 c har *owl_zwrite_get_recip_n(owl_zwrite *z, int n)369 const char *owl_zwrite_get_recip_n(const owl_zwrite *z, int n) 367 370 { 368 371 return(owl_list_get_element(&(z->recips), n)); 369 372 } 370 373 371 int owl_zwrite_is_personal( owl_zwrite *z)374 int owl_zwrite_is_personal(const owl_zwrite *z) 372 375 { 373 376 /* return true if at least one of the recipients is personal */
Note: See TracChangeset
for help on using the changeset viewer.